Replace stoul with ToIntegral in dbwrapper

This commit is contained in:
MarcoFalke committed 2021-10-07 11:06:37 +02:00
1 parent c0b6c96eee
commit fa165e9545
2 files changed
+5 -4

No files matched your search

+5 -3
View File
@@ -197,13 +197,15 @@ bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
return true;
}
size_t CDBWrapper::DynamicMemoryUsage() const {
size_t CDBWrapper::DynamicMemoryUsage() const
{
std::string memory;
if (!pdb->GetProperty("leveldb.approximate-memory-usage", &memory)) {
std::optional<size_t> parsed;
if (!pdb->GetProperty("leveldb.approximate-memory-usage", &memory) || !(parsed = ToIntegral<size_t>(memory))) {
LogPrint(BCLog::LEVELDB, "Failed to get approximate-memory-usage property\n");
return 0;
}
return stoul(memory);
return parsed.value();
}
// Prefixed with null character to avoid collisions with other keys
-1
View File
@@ -42,7 +42,6 @@ export LC_ALL=C
# TODO: Reduce KNOWN_VIOLATIONS by replacing uses of locale dependent snprintf with strprintf.
KNOWN_VIOLATIONS=(
"src/bitcoin-tx.cpp.*stoul"
"src/dbwrapper.cpp.*stoul"
"src/dbwrapper.cpp:.*vsnprintf"
"src/rest.cpp:.*strtol"
"src/test/dbwrapper_tests.cpp:.*snprintf"