diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-04-04 11:30:55 +0200 |
|---|---|---|
| committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-04-06 02:29:33 +0200 |
| commit | b001c871260420c6638d20c1d5039007e235d66c (patch) | |
| tree | ee98fa7da0236fa4d60cb5615c2b30b9f7a8b078 /src/init.cpp | |
| parent | 430cbad4112781e90f9c5d87443b0b5f7c2a4a08 (diff) | |
| download | bitcoin-b001c871260420c6638d20c1d5039007e235d66c.tar.xz | |
small indentation, space, formatting fixes (no code changes)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index ee69d2207f..66272e8421 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<boost::filesystem::path> 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!" |