highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-06 13:09:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Remove confusing double return value ret+success

Browse Source 
Also, remove redundant comments
This commit is contained in:
MarcoFalke
2020-06-20 08:44:42 -04:00
parent d4f9ae0025
commit fa021e9a5b
2 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/bdb.cpp
View File

@@ -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;
}