aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/db.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <[email protected]>2016-02-27 06:11:04 +0000
committerLuke Dashjr <[email protected]>2016-02-27 06:11:37 +0000
commite5daa2e2aef61f0b9441d19f0b67015f426c6056 (patch)
tree90a095dcd23c8a74cb605f55e224a902cba75a06 /src/wallet/db.cpp
parentBugfix: gitian: Add curl to packages (now needed for depends) (diff)
parentMerge #7583: [doc] Fix typos (diff)
downloaddiscoin-e5daa2e2aef61f0b9441d19f0b67015f426c6056.tar.xz
discoin-e5daa2e2aef61f0b9441d19f0b67015f426c6056.zip
Merge branch 'master' into depends_curl
Diffstat (limited to 'src/wallet/db.cpp')
-rw-r--r--src/wallet/db.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 4b9dbebdd..6af5413a9 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2009-2015 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -193,9 +193,9 @@ bool CDBEnv::Salvage(const std::string& strFile, bool fAggressive, std::vector<C
// Format of bdb dump is ascii lines:
// header lines...
// HEADER=END
- // hexadecimal key
- // hexadecimal value
- // ... repeated
+ // hexadecimal key
+ // hexadecimal value
+ // ... repeated
// DATA=END
string strLine;
@@ -205,7 +205,7 @@ bool CDBEnv::Salvage(const std::string& strFile, bool fAggressive, std::vector<C
std::string keyHex, valueHex;
while (!strDump.eof() && keyHex != "DATA=END") {
getline(strDump, keyHex);
- if (keyHex != "DATA_END") {
+ if (keyHex != "DATA=END") {
getline(strDump, valueHex);
vResult.push_back(make_pair(ParseHex(keyHex), ParseHex(valueHex)));
}