fixup! walletdb: Handle cursor internally

promag · promag · commit 04998ef3cb86 · 2020-06-22T23:50:29.000+01:00
diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp
@@ -335,7 +335,7 @@ void BerkeleyEnvironment::CheckpointLSN(const std::string& strFile)
 }
 
 
-BerkeleyBatch::BerkeleyBatch(BerkeleyDatabase& database, const char* pszMode, bool fFlushOnCloseIn) : pdb(nullptr), activeTxn(nullptr), m_cursor(nullptr)
+BerkeleyBatch::BerkeleyBatch(BerkeleyDatabase& database, const char* pszMode, bool fFlushOnCloseIn)
 {
     fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
     fFlushOnClose = fFlushOnCloseIn;
diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h
@@ -208,10 +208,10 @@ class BerkeleyBatch
     };
 
 protected:
-    Db* pdb;
+    Db* pdb{nullptr};
     std::string strFile;
-    DbTxn* activeTxn;
-    Dbc* m_cursor;
+    DbTxn* activeTxn{nullptr};
+    Dbc* m_cursor{nullptr};
     bool fReadOnly;
     bool fFlushOnClose;
     BerkeleyEnvironment *env;

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ void BerkeleyEnvironment::CheckpointLSN(const std::string& strFile)`
`335`	`335`	`}`
`336`	`336`
`337`	`337`
`338`		`-BerkeleyBatch::BerkeleyBatch(BerkeleyDatabase& database, const char* pszMode, bool fFlushOnCloseIn) : pdb(nullptr), activeTxn(nullptr), m_cursor(nullptr)`
	`338`	`+BerkeleyBatch::BerkeleyBatch(BerkeleyDatabase& database, const char* pszMode, bool fFlushOnCloseIn)`
`339`	`339`	`{`
`340`	`340`	`fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));`
`341`	`341`	`fFlushOnClose = fFlushOnCloseIn;`