aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-10-09 23:35:42 -0700
committerWladimir J. van der Laan <[email protected]>2013-10-09 23:35:42 -0700
commita302c21e0b0484fef91673c9072c1af7c278698e (patch)
tree5f903516195f9aae66c70a1854c55f202d1b9814
parentMerge pull request #3068 from Diapolo/qt-icon (diff)
parentmake fCommandLine a local variable in AppInit() (diff)
downloaddiscoin-a302c21e0b0484fef91673c9072c1af7c278698e.tar.xz
discoin-a302c21e0b0484fef91673c9072c1af7c278698e.zip
Merge pull request #3066 from Diapolo/rem_global
make fCommandLine a local variable in AppInit()
-rw-r--r--src/bitcoind.cpp1
-rw-r--r--src/util.cpp1
-rw-r--r--src/util.h1
3 files changed, 1 insertions, 2 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 407e1d28c..add3b4e1f 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -69,6 +69,7 @@ bool AppInit(int argc, char* argv[])
}
// Command-line RPC
+ bool fCommandLine = false;
for (int i = 1; i < argc; i++)
if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:"))
fCommandLine = true;
diff --git a/src/util.cpp b/src/util.cpp
index 73428b4c2..cfaf5bdf8 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -78,7 +78,6 @@ bool fPrintToConsole = false;
bool fPrintToDebugger = false;
bool fDaemon = false;
bool fServer = false;
-bool fCommandLine = false;
string strMiscWarning;
bool fNoListen = false;
bool fLogTimestamps = false;
diff --git a/src/util.h b/src/util.h
index a216aacdc..c3fb01dbf 100644
--- a/src/util.h
+++ b/src/util.h
@@ -145,7 +145,6 @@ extern bool fPrintToConsole;
extern bool fPrintToDebugger;
extern bool fDaemon;
extern bool fServer;
-extern bool fCommandLine;
extern std::string strMiscWarning;
extern bool fNoListen;
extern bool fLogTimestamps;