Change atoi64 to ParseInt64

Author: jamescowens

src/gridcoin/scraper/scraper.cpp

@@ -1914,20 +1914,18 @@ bool ProcessProjectTeamFile(const std::string& project, const fs::path& file, co
 
             int64_t nTeamID = 0;
 
-            try
-            {
-                nTeamID = atoi64(sTeamID);
-            }
-            catch (const std::exception&)
+            if (!ParseInt64(sTeamID, &nTeamID))
             {
-                _log(logattribute::ERR, "ProccessProjectTeamFile", tfm::format("Ignoring bad team id for team %s.", sTeamName));
+                _log(logattribute::ERR, __func__, tfm::format("Ignoring bad team id for team %s.", sTeamName));
                 continue;
             }
 
             mTeamIdsForProject[sTeamName] = nTeamID;
         }
         else
+        {
             builder.append(line);
+        }
     }
 
     if (mTeamIdsForProject.empty())
@@ -2319,13 +2317,9 @@ bool ProcessProjectRacFileByCPID(const std::string& project, const fs::path& fil
                 const std::string& sTeamID = ExtractXML(data, "<teamid>", "</teamid>");
                 int64_t nTeamID = 0;
 
-                try
+                if (!ParseInt64(sTeamID, &nTeamID))
                 {
-                    nTeamID = atoi64(sTeamID);
-                }
-                catch (const std::exception&)
-                {
-                    _log(logattribute::ERR, "ProcessProjectRacFileByCPID", "Bad team id in user stats file data.");
+                    _log(logattribute::ERR, __func__, "Bad team id in user stats file data.");
                     continue;
                 }
 
@@ -2585,13 +2579,9 @@ bool LoadTeamIDList(const fs::path& file)
                 sProject = iter;
             else
             {
-                try
-                {
-                    nTeamID = atoi64(iter);
-                }
-                catch (std::exception&)
+                if (!ParseInt64(iter, &nTeamID))
                 {
-                    _log(logattribute::ERR, "LoadTeamIDList", "Ignoring invalid team id found in team id file.");
+                    _log(logattribute::ERR, __func__, "Ignoring invalid team id found in team id file.");
                     continue;
                 }
 

src/gridcoin/staking/reward.cpp

@@ -46,7 +46,12 @@ CAmount GRC::GetConstantBlockReward(const CBlockIndex* index)
     //TODO: refactor the expire checking to subroutine
     //Note: time constant is same as GetBeaconPublicKey
     if ((index->nTime - oCBReward.timestamp) <= (60 * 24 * 30 * 6 * 60)) {
-        reward = atoi64(oCBReward.value);
+        // This is a little slippery, because if we ever change CAmount from a int64_t, this will
+        // break. It is unlikely to ever change, however, and avoids an extra copy/implicit cast.
+        if (!ParseInt64(oCBReward.value, &reward)) {
+            error("%s: Cannot parse constant block reward from protocol entry: %s",
+                  __func__, oCBReward.value);
+        }
     }
 
     reward = std::clamp(reward, MIN_CBR, MAX_CBR);

src/util.cpp

@@ -245,7 +245,12 @@ bool ParseMoney(const char* pszIn, int64_t& nRet)
         return false;
     if (nUnits < 0 || nUnits > COIN)
         return false;
-    int64_t nWhole = atoi64(strWhole);
+
+    int64_t nWhole = 0;
+
+    // Because of the protection above, this assert should never fail.
+    assert(!ParseInt64(strWhole, &nWhole));
+
     int64_t nValue = nWhole*COIN + nUnits;
 
     nRet = nValue;

src/util/system.cpp

@@ -496,7 +496,24 @@ std::string ArgsManager::GetArg(const std::string& strArg, const std::string& st
 int64_t ArgsManager::GetArg(const std::string& strArg, int64_t nDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
-    return value.isNull() ? nDefault : value.isFalse() ? 0 : value.isTrue() ? 1 : value.isNum() ? value.get_int64() : atoi64(value.get_str());
+
+    int64_t arg_value = 0;
+
+    if (value.isNull()) {
+        arg_value = nDefault;
+    } else if (value.isFalse()) {
+        arg_value = 0;
+    } else if (value.isTrue()) {
+        arg_value = 1;
+    } else if (value.isNum()) {
+        arg_value = value.get_int64();
+    } else {
+        if (!ParseInt64(value.get_str(), &arg_value)) {
+            // Do nothing. If we get here and the string cannot be parsed, it should return zero, just like atoi64.
+        }
+    }
+
+    return arg_value;
 }
 
 bool ArgsManager::GetBoolArg(const std::string& strArg, bool fDefault) const

src/wallet/wallet.h

@@ -451,7 +451,12 @@ static void ReadOrderPos(int64_t& nOrderPos, mapValue_t& mapValue)
         nOrderPos = -1; // TODO : calculate elsewhere
         return;
     }
-    nOrderPos = atoi64(mapValue["n"].c_str());
+
+    nOrderPos = 0;
+    if (!ParseInt64(mapValue["n"], &nOrderPos))
+    {
+        error("%s: nOrderPos cannot be parsed: %s.", __func__, mapValue["n"]);
+    }
 }
 
 
@@ -601,9 +606,9 @@ class CWalletTx : public CMerkleTx
 
             ReadOrderPos(nOrderPos, mapValue);
 
-            nTimeSmart = mapValue.count("timesmart")
-                ? (unsigned int)atoi64(mapValue["timesmart"])
-                : 0;
+            if (!mapValue.count("timesmart") || !ParseUInt(mapValue["timesmart"], &nTimeSmart)) {
+                nTimeSmart = 0;
+            }
         }
 
         mapValue.erase("fromaccount");