aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@bitpay.com>2013-06-19 11:32:49 -0400
committerJeff Garzik <jgarzik@bitpay.com>2013-06-19 11:32:49 -0400
commit168ba993921c2c1a21cad1f03a331f7c01c67079 (patch)
tree322cc79cf2e856618df25ecee1cea13cf3594e43 /src
parent25dbb928600b2c65bc20ce026c5f9cf1fb457d60 (diff)
downloadbitcoin-168ba993921c2c1a21cad1f03a331f7c01c67079.tar.xz
Pass check level, check depth to VerifyDB()
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp3
-rw-r--r--src/main.cpp5
-rw-r--r--src/main.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp
index fe74cd6963..ec10e627f5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -757,7 +757,8 @@ bool AppInit2(boost::thread_group& threadGroup)
}
uiInterface.InitMessage(_("Verifying blocks..."));
- if (!VerifyDB()) {
+ if (!VerifyDB(GetArg("-checklevel", 3),
+ GetArg( "-checkblocks", 288))) {
strLoadError = _("Corrupted block database detected");
break;
}
diff --git a/src/main.cpp b/src/main.cpp
index f0c08d273f..58c0c93635 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2616,13 +2616,12 @@ bool static LoadBlockIndexDB()
return true;
}
-bool VerifyDB() {
+bool VerifyDB(int nCheckLevel, int nCheckDepth)
+{
if (pindexBest == NULL || pindexBest->pprev == NULL)
return true;
// Verify blocks in the best chain
- int nCheckLevel = GetArg("-checklevel", 3);
- int nCheckDepth = GetArg( "-checkblocks", 288);
if (nCheckDepth == 0)
nCheckDepth = 1000000000; // suffices until the year 19000
if (nCheckDepth > nBestHeight)
diff --git a/src/main.h b/src/main.h
index 87f1dbfa8f..19d4a87b39 100644
--- a/src/main.h
+++ b/src/main.h
@@ -146,7 +146,7 @@ bool LoadBlockIndex();
/** Unload database information */
void UnloadBlockIndex();
/** Verify consistency of the block and coin databases */
-bool VerifyDB();
+bool VerifyDB(int nCheckLevel, int nCheckDepth);
/** Print the loaded block tree */
void PrintBlockTree();
/** Find a block by height in the currently-connected chain */