From b001c871260420c6638d20c1d5039007e235d66c Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 4 Apr 2013 11:30:55 +0200 Subject: small indentation, space, formatting fixes (no code changes) --- src/init.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index ee69d2207..66272e842 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -217,16 +217,16 @@ bool AppInit(int argc, char* argv[]) PrintExceptionContinue(NULL, "AppInit()"); } if (!fRet) { - if (detectShutdownThread) - detectShutdownThread->interrupt(); - threadGroup.interrupt_all(); + if (detectShutdownThread) + detectShutdownThread->interrupt(); + threadGroup.interrupt_all(); } if (detectShutdownThread) { detectShutdownThread->join(); delete detectShutdownThread; - detectShutdownThread = NULL; + detectShutdownThread = NULL; } Shutdown(); @@ -376,7 +376,6 @@ struct CImportingNow } }; - void ThreadImport(std::vector vImportFiles) { RenameThread("bitcoin-loadblk"); @@ -633,7 +632,6 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 6: network initialization int nSocksVersion = GetArg("-socks", 5); - if (nSocksVersion != 4 && nSocksVersion != 5) return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion)); @@ -733,6 +731,7 @@ bool AppInit2(boost::thread_group& threadGroup) fReindex = GetBoolArg("-reindex"); + // Todo: Check if needed, because in step 5 we do the same if (!bitdb.Open(GetDataDir())) { string msg = strprintf(_("Error initializing database environment %s!" -- cgit v1.2.3