From fa021e9a5b7e930a3db0febb416942dea3a90a8f Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 20 Jun 2020 08:44:42 -0400 Subject: wallet: Remove confusing double return value ret+success Also, remove redundant comments --- src/wallet/bdb.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/wallet/bdb.cpp') diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp index 125bf004e..a3a56aa51 100644 --- a/src/wallet/bdb.cpp +++ b/src/wallet/bdb.cpp @@ -809,10 +809,8 @@ bool BerkeleyBatch::ReadKey(CDataStream& key, CDataStream& value) if (!pdb) return false; - // Key SafeDbt datKey(key.data(), key.size()); - // Read SafeDbt datValue; int ret = pdb->get(activeTxn, datKey, datValue, 0); if (ret == 0 && datValue.get_data() != nullptr) { @@ -829,13 +827,10 @@ bool BerkeleyBatch::WriteKey(CDataStream& key, CDataStream& value, bool overwrit if (fReadOnly) assert(!"Write called on database in read-only mode"); - // Key SafeDbt datKey(key.data(), key.size()); - // Value SafeDbt datValue(value.data(), value.size()); - // Write int ret = pdb->put(activeTxn, datKey, datValue, (overwrite ? 0 : DB_NOOVERWRITE)); return (ret == 0); } @@ -847,10 +842,8 @@ bool BerkeleyBatch::EraseKey(CDataStream& key) if (fReadOnly) assert(!"Erase called on database in read-only mode"); - // Key SafeDbt datKey(key.data(), key.size()); - // Erase int ret = pdb->del(activeTxn, datKey, 0); return (ret == 0 || ret == DB_NOTFOUND); } @@ -860,10 +853,8 @@ bool BerkeleyBatch::HasKey(CDataStream& key) if (!pdb) return false; - // Key SafeDbt datKey(key.data(), key.size()); - // Exists int ret = pdb->exists(activeTxn, datKey, 0); return ret == 0; } -- cgit v1.2.3 From fa8a341b88cabfd7f8d702db7cb9972b0804bf2a Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 20 Jun 2020 08:55:07 -0400 Subject: wallet: Replace CDataStream& with CDataStream&& where appropriate The keys and values are only to be used once because their memory is set to zero. Make that explicit by moving the bytes into the lower level methods. --- src/wallet/bdb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/wallet/bdb.cpp') diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp index a3a56aa51..267b147f3 100644 --- a/src/wallet/bdb.cpp +++ b/src/wallet/bdb.cpp @@ -804,7 +804,7 @@ std::string BerkeleyDatabaseVersion() return DbEnv::version(nullptr, nullptr, nullptr); } -bool BerkeleyBatch::ReadKey(CDataStream& key, CDataStream& value) +bool BerkeleyBatch::ReadKey(CDataStream&& key, CDataStream& value) { if (!pdb) return false; @@ -820,7 +820,7 @@ bool BerkeleyBatch::ReadKey(CDataStream& key, CDataStream& value) return false; } -bool BerkeleyBatch::WriteKey(CDataStream& key, CDataStream& value, bool overwrite) +bool BerkeleyBatch::WriteKey(CDataStream&& key, CDataStream&& value, bool overwrite) { if (!pdb) return true; @@ -835,7 +835,7 @@ bool BerkeleyBatch::WriteKey(CDataStream& key, CDataStream& value, bool overwrit return (ret == 0); } -bool BerkeleyBatch::EraseKey(CDataStream& key) +bool BerkeleyBatch::EraseKey(CDataStream&& key) { if (!pdb) return false; @@ -848,7 +848,7 @@ bool BerkeleyBatch::EraseKey(CDataStream& key) return (ret == 0 || ret == DB_NOTFOUND); } -bool BerkeleyBatch::HasKey(CDataStream& key) +bool BerkeleyBatch::HasKey(CDataStream&& key) { if (!pdb) return false; -- cgit v1.2.3