Merge pull request #3066 from Diapolo/rem_global

make fCommandLine a local variable in AppInit()

Author: laanwj

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;

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;

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;