foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

Replace stoul with ToIntegral in dbwrapper

Browse source
This commit is contained in:
MarcoFalke 2021-10-07 11:18:19 +02:00
parent c0b6c96eee
commit fa165e9545
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dbwrapper.cpp
View file

@ -197,13 +197,15 @@ bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
return true; return true;
} }
size_t CDBWrapper::DynamicMemoryUsage() const { size_t CDBWrapper::DynamicMemoryUsage() const
{
std::string memory; 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"); LogPrint(BCLog::LEVELDB, "Failed to get approximate-memory-usage property\n");
return 0; return 0;
} }
return stoul(memory); return parsed.value();
} }
// Prefixed with null character to avoid collisions with other keys // Prefixed with null character to avoid collisions with other keys

1
test/lint/lint-locale-dependence.sh
View file

@ -42,7 +42,6 @@ export LC_ALL=C
# TODO: Reduce KNOWN_VIOLATIONS by replacing uses of locale dependent snprintf with strprintf. # TODO: Reduce KNOWN_VIOLATIONS by replacing uses of locale dependent snprintf with strprintf.
KNOWN_VIOLATIONS=( KNOWN_VIOLATIONS=(
"src/bitcoin-tx.cpp.*stoul" "src/bitcoin-tx.cpp.*stoul"
"src/dbwrapper.cpp.*stoul"
"src/dbwrapper.cpp:.*vsnprintf" "src/dbwrapper.cpp:.*vsnprintf"
"src/rest.cpp:.*strtol" "src/rest.cpp:.*strtol"
"src/test/dbwrapper_tests.cpp:.*snprintf" "src/test/dbwrapper_tests.cpp:.*snprintf"