diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-06 15:15:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-06 15:20:08 +0200 |
| commit | d077f43f7ecf4b49a220cd2341d062bffffc6991 (patch) | |
| tree | 01f9a48cb9f883461e8068ebc73b15a0742d4562 | |
| parent | e82fb872ff5cc8fd22d43327c1ee3e755f61c562 (diff) | |
| parent | ff2ed7a5bc8f56d2c0cd8d4fa6cf06ecfe17f1b2 (diff) | |
Merge #8663: trivial: remove unnecessary variable fDaemon
ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)
| -rw-r--r-- | src/bitcoind.cpp | 5 | ||||
| -rw-r--r-- | src/util.cpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 28bc374acc..322298d1b3 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -40,8 +40,6 @@ * Use the buttons <code>Namespaces</code>, <code>Classes</code> or <code>Files</code> at the top of the page to start navigating the code. */ -static bool fDaemon; - void WaitForShutdown(boost::thread_group* threadGroup) { bool fShutdown = ShutdownRequested(); @@ -130,8 +128,7 @@ bool AppInit(int argc, char* argv[]) exit(1); } #ifndef WIN32 - fDaemon = GetBoolArg("-daemon", false); - if (fDaemon) + if (GetBoolArg("-daemon", false)) { fprintf(stdout, "Bitcoin server starting\n"); diff --git a/src/util.cpp b/src/util.cpp index ee12f2b443..c7d147a11e 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -107,7 +107,6 @@ map<string, vector<string> > mapMultiArgs; bool fDebug = false; bool fPrintToConsole = false; bool fPrintToDebugLog = true; -bool fDaemon = false; bool fServer = false; string strMiscWarning; bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS; |