diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-08-31 16:20:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-08-31 16:40:29 +0200 |
| commit | abc677c9a98aece686670562e9bd1a42e295ae83 (patch) | |
| tree | 75de181d0c2b55c23ed2b34a35a4f0e8661024a9 /src/wallet/db.cpp | |
| parent | Merge #8291: [util] CopyrightHolders: Check for untranslated substitution (diff) | |
| parent | Do not shadow variables. (diff) | |
| download | discoin-abc677c9a98aece686670562e9bd1a42e295ae83.tar.xz discoin-abc677c9a98aece686670562e9bd1a42e295ae83.zip | |
Merge #8191: Do not shadow variables in src/wallet
b175cb7 Do not shadow variables. (Pavel JanÃk)
Diffstat (limited to 'src/wallet/db.cpp')
| -rw-r--r-- | src/wallet/db.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index ab7a4cf2e..a809c9ad6 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -387,11 +387,11 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) while (fSuccess) { CDataStream ssKey(SER_DISK, CLIENT_VERSION); CDataStream ssValue(SER_DISK, CLIENT_VERSION); - int ret = db.ReadAtCursor(pcursor, ssKey, ssValue); - if (ret == DB_NOTFOUND) { + int ret1 = db.ReadAtCursor(pcursor, ssKey, ssValue); + if (ret1 == DB_NOTFOUND) { pcursor->close(); break; - } else if (ret != 0) { + } else if (ret1 != 0) { pcursor->close(); fSuccess = false; break; |