Issue 4128, 5138 - Add Parser and Serializer implemented in C++

compiled/subscription/Subscription.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cstdio>
 #include <cstdlib>
+#include <random>
 
 #include "Subscription.h"
 #include "DownloadableSubscription.h"
 #include "UserDefinedSubscription.h"
 #include "../StringMap.h"
+
+ABP_NS_USING
 
 namespace
 {
   StringMap<Subscription*> knownSubscriptions(16);
 }
 
 Subscription::Subscription(Type type, const String& id, const KeyValues& properties)
     : mID(id), mType(type), mDisabled(false), mListed(false)
 {
   annotate_address(this, "Subscription");
@@ skipping 54 matching lines @@
     result.append(u"disabled=true\n"_str);
 
   return result;
 }
 
 SubscriptionPtr Subscription::FromProperties(const String& id, const KeyValues& keyValues)
 {
   if (id.empty())
   {
     // Generate a new random ID
-    unsigned int seed = knownSubscriptions.size();
+    std::mt19937 gen(knownSubscriptions.size());
     OwnedString randomID(u"~user~000000"_str);
     do
     {
-      int number = rand_r(&seed);
-      for (int i = randomID.length() - 6; i < randomID.length(); i++)
+      int number = gen();
+      for (String::size_type i = randomID.length() - 6; i < randomID.length(); i++)
       {
         randomID[i] = '0' + (number % 10);
         number /= 10;
       }
     } while (knownSubscriptions.find(randomID));
     return FromProperties(randomID, keyValues);
   }
 
   auto knownSubscription = knownSubscriptions.find(id);
   if (knownSubscription)
@@ skipping 23 matching lines @@
   return FromProperties(*id, properties);
 }
 
 const String* Subscription::findPropertyValue(const Subscription::KeyValues& properties, const String& propertyName)
 {
   for (const auto& property : properties)
     if (property.first == propertyName)
       return &property.second;
   return nullptr;
 }