aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-06-05 14:52:07 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-06-05 14:52:34 +0200
commit7d4dda7630a67ae1aacfc799ed743e69562a41df (patch)
tree79d777a0a2610653330635423e46922c95a81201 /src
parenta92aded70ec2346c3f07ff1cf8eb97101a76912f (diff)
Remove global strWalletFile
As it says on the tin. There is no need to have this variable be global, it's only used in AppInit2.
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp3
-rw-r--r--src/init.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 96f7f7b3c8..d924bd293b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -40,7 +40,6 @@ using namespace std;
using namespace boost;
#ifdef ENABLE_WALLET
-std::string strWalletFile;
CWallet* pwalletMain;
#endif
@@ -584,7 +583,7 @@ bool AppInit2(boost::thread_group& threadGroup)
}
bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
- strWalletFile = GetArg("-wallet", "wallet.dat");
+ std::string strWalletFile = GetArg("-wallet", "wallet.dat");
#endif
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
diff --git a/src/init.h b/src/init.h
index 2f56923055..4a967bea37 100644
--- a/src/init.h
+++ b/src/init.h
@@ -14,7 +14,6 @@ namespace boost {
class thread_group;
};
-extern std::string strWalletFile;
extern CWallet* pwalletMain;
void StartShutdown();