Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-29 12:46:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

BlockchainLMDB: Replace remaining txn pointer NULLs with nullptr

Browse Source 
For consistency.
This commit is contained in:
warptangent 2016-02-13 03:35:48 -08:00
parent 24ccdb9b6e
commit f5581c3536
No known key found for this signature in database
GPG Key ID: 0E490BEBFBE4E92D
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -235,7 +235,7 @@ mdb_txn_safe::mdb_txn_safe() : m_txn(NULL)
mdb_txn_safe::~mdb_txn_safe()
{
LOG_PRINT_L3("mdb_txn_safe: destructor");
if (m_txn != NULL)
if (m_txn != nullptr)
{
if (m_batch_txn) // this is a batch txn and should have been handled before this point for safety
{
@ -265,19 +265,19 @@ void mdb_txn_safe::commit(std::string message)
if (auto result = mdb_txn_commit(m_txn))
{
m_txn = NULL;
m_txn = nullptr;
throw0(DB_ERROR((message + ": ").append(mdb_strerror(result)).c_str()));
}
m_txn = NULL;
m_txn = nullptr;
}
void mdb_txn_safe::abort()
{
LOG_PRINT_L3("mdb_txn_safe: abort()");
if(m_txn != NULL)
if(m_txn != nullptr)
{
mdb_txn_abort(m_txn);
m_txn = NULL;
m_txn = nullptr;
}
else
{
@ -2216,7 +2216,7 @@ void BlockchainLMDB::block_txn_stop()
time_commit1 += time1;
delete m_write_txn;
m_write_txn = NULL;
m_write_txn = nullptr;
}
}
@ -2226,7 +2226,7 @@ void BlockchainLMDB::block_txn_abort()
if (! m_batch_active)
{
delete m_write_txn;
m_write_txn = NULL;
m_write_txn = nullptr;
}
}
@ -2280,7 +2280,7 @@ void BlockchainLMDB::pop_block(block& blk, std::vector<transaction>& txs)
BlockchainDB::pop_block(blk, txs);
if (! m_batch_active)
{
m_write_txn = NULL;
m_write_txn = nullptr;
txn.commit();
}
@ -2288,7 +2288,7 @@ void BlockchainLMDB::pop_block(block& blk, std::vector<transaction>& txs)
catch (...)
{
m_num_outputs = num_outputs;
m_write_txn = NULL;
m_write_txn = nullptr;
throw;
}