Make some global variables less-global (static)

Explicitly make these global variables less-global to reduce the maximum
scope of this global state.

In my experience global variables tend to be a major source of bugs. As
such the less accessible they are the less likely they are to be the
source of a bug.

Signed-off-by: Giel van Schijndel <[email protected]>

diff --git a/src/main.cpp b/src/main.cpp
index f4833120654285f1ba5f2d133d6d1a6c01fc86c6..8b4b3df9826616b99bec09bb02ca3a8f570334bc 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,14 +22,14 @@ set<CWallet*> setpwalletRegistered;
 
 CCriticalSection cs_main;
 
-map<uint256, CTransaction> mapTransactions;
+static map<uint256, CTransaction> mapTransactions;
 CCriticalSection cs_mapTransactions;
 unsigned int nTransactionsUpdated = 0;
 map<COutPoint, CInPoint> mapNextTx;
 
 map<uint256, CBlockIndex*> mapBlockIndex;
 uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
-CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
+static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
 const int nTotalBlocksEstimate = 134444; // Conservative estimate of total nr of blocks on main chain
 const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download"
 CBlockIndex* pindexGenesisBlock = NULL;

diff --git a/src/main.h b/src/main.h
index 97a40d3ec961ea2bc0a8514fbfedb017e5bda11b..d4b89225d12789fd4ff277cc0343399b16b51262 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -54,7 +54,6 @@ static const int fHaveUPnP = false;
 extern CCriticalSection cs_main;
 extern std::map<uint256, CBlockIndex*> mapBlockIndex;
 extern uint256 hashGenesisBlock;
-extern CBigNum bnProofOfWorkLimit;
 extern CBlockIndex* pindexGenesisBlock;
 extern int nBestHeight;
 extern CBigNum bnBestChainWork;
@@ -1558,16 +1557,4 @@ public:
     bool ProcessAlert();
 };
 
-
-
-
-
-
-
-
-
-
-
-extern std::map<uint256, CTransaction> mapTransactions;
-
 #endif

diff --git a/src/net.cpp b/src/net.cpp
index 3953f021e96596d23b529eac9e94e6a9db86ba33..df98457c729cfcfc87af78a1edf07760c095294e 100644 (file)
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -50,10 +50,10 @@ bool fClient = false;
 bool fAllowDNS = false;
 uint64 nLocalServices = (fClient ? 0 : NODE_NETWORK);
 CAddress addrLocalHost("0.0.0.0", 0, false, nLocalServices);
-CNode* pnodeLocalHost = NULL;
+static CNode* pnodeLocalHost = NULL;
 uint64 nLocalHostNonce = 0;
 array<int, 10> vnThreadsRunning;
-SOCKET hListenSocket = INVALID_SOCKET;
+static SOCKET hListenSocket = INVALID_SOCKET;
 
 vector<CNode*> vNodes;
 CCriticalSection cs_vNodes;

diff --git a/src/net.h b/src/net.h
index 3b098e1a8260cdfa5a391874a12dc2a191d478b2..52568ef4cec8f855605370d449d958bf3d9ec1fb 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -476,10 +476,8 @@ extern bool fClient;
 extern bool fAllowDNS;
 extern uint64 nLocalServices;
 extern CAddress addrLocalHost;
-extern CNode* pnodeLocalHost;
 extern uint64 nLocalHostNonce;
 extern boost::array<int, 10> vnThreadsRunning;
-extern SOCKET hListenSocket;
 
 extern std::vector<CNode*> vNodes;
 extern CCriticalSection cs_vNodes;