Browse Source

Merge pull request #4777

8bdd287 Fix a few "Uninitialized scalar field" warnings (Wladimir J. van der Laan)
0.10
Wladimir J. van der Laan 10 years ago
parent
commit
faeb341da3
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/bloom.h
  2. 2
      src/db.cpp
  3. 2
      src/key.h
  4. 4
      src/main.h
  5. 7
      src/txmempool.cpp
  6. 1
      src/wallet.h

2
src/bloom.h

@ -60,7 +60,7 @@ public:
// It should generally always be a random value (and is largely only exposed for unit testing) // It should generally always be a random value (and is largely only exposed for unit testing)
// nFlags should be one of the BLOOM_UPDATE_* enums (not _MASK) // nFlags should be one of the BLOOM_UPDATE_* enums (not _MASK)
CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak, unsigned char nFlagsIn); CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak, unsigned char nFlagsIn);
CBloomFilter() : isFull(true) {} CBloomFilter() : isFull(true), isEmpty(false), nHashFuncs(0), nTweak(0), nFlags(0) {}
IMPLEMENT_SERIALIZE IMPLEMENT_SERIALIZE
( (

2
src/db.cpp

@ -227,10 +227,10 @@ CDB::CDB(const char *pszFile, const char* pszMode) :
pdb(NULL), activeTxn(NULL) pdb(NULL), activeTxn(NULL)
{ {
int ret; int ret;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
if (pszFile == NULL) if (pszFile == NULL)
return; return;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
bool fCreate = strchr(pszMode, 'c'); bool fCreate = strchr(pszMode, 'c');
unsigned int nFlags = DB_THREAD; unsigned int nFlags = DB_THREAD;
if (fCreate) if (fCreate)

2
src/key.h

@ -189,7 +189,7 @@ private:
public: public:
// Construct an invalid private key. // Construct an invalid private key.
CKey() : fValid(false) { CKey() : fValid(false), fCompressed(false) {
LockObject(vch); LockObject(vch);
} }

4
src/main.h

@ -328,7 +328,7 @@ private:
int nHashType; int nHashType;
public: public:
CScriptCheck() {} CScriptCheck(): ptxTo(0), nIn(0), nFlags(0), nHashType(0) {}
CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, int nHashTypeIn) : CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, int nHashTypeIn) :
scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey),
ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), nHashType(nHashTypeIn) { } ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), nHashType(nHashTypeIn) { }
@ -876,7 +876,7 @@ private:
unsigned char chRejectCode; unsigned char chRejectCode;
bool corruptionPossible; bool corruptionPossible;
public: public:
CValidationState() : mode(MODE_VALID), nDoS(0), corruptionPossible(false) {} CValidationState() : mode(MODE_VALID), nDoS(0), chRejectCode(0), corruptionPossible(false) {}
bool DoS(int level, bool ret = false, bool DoS(int level, bool ret = false,
unsigned char chRejectCodeIn=0, std::string strRejectReasonIn="", unsigned char chRejectCodeIn=0, std::string strRejectReasonIn="",
bool corruptionIn=false) { bool corruptionIn=false) {

7
src/txmempool.cpp

@ -11,7 +11,8 @@
using namespace std; using namespace std;
CTxMemPoolEntry::CTxMemPoolEntry() CTxMemPoolEntry::CTxMemPoolEntry():
nFee(0), nTxSize(0), nTime(0), dPriority(0.0)
{ {
nHeight = MEMPOOL_HEIGHT; nHeight = MEMPOOL_HEIGHT;
} }
@ -345,7 +346,9 @@ public:
}; };
CTxMemPool::CTxMemPool(const CFeeRate& _minRelayFee) : minRelayFee(_minRelayFee) CTxMemPool::CTxMemPool(const CFeeRate& _minRelayFee) :
nTransactionsUpdated(0),
minRelayFee(_minRelayFee)
{ {
// Sanity checks off by default for performance, because otherwise // Sanity checks off by default for performance, because otherwise
// accepting transactions becomes O(N^2) where N is the number // accepting transactions becomes O(N^2) where N is the number

1
src/wallet.h

@ -905,6 +905,7 @@ public:
strOtherAccount.clear(); strOtherAccount.clear();
strComment.clear(); strComment.clear();
nOrderPos = -1; nOrderPos = -1;
nEntryNo = 0;
} }
IMPLEMENT_SERIALIZE IMPLEMENT_SERIALIZE

Loading…
Cancel
Save