From efe255d24291ca83efa9caee3696a8f1451b3b11 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 15 Nov 2020 14:58:18 +0300
Subject: txn_ptr::abort() not to be mixed with common ::abort()
---
plugins/Dbx_mdbx/src/dbcheck.cpp | 6 +++---
plugins/Dbx_mdbx/src/dbcontacts.cpp | 18 +++++++++---------
plugins/Dbx_mdbx/src/dbcrypt.cpp | 8 ++++----
plugins/Dbx_mdbx/src/dbevents.cpp | 6 +++---
plugins/Dbx_mdbx/src/dbintf.cpp | 2 +-
plugins/Dbx_mdbx/src/dbmodulechain.cpp | 2 +-
plugins/Dbx_mdbx/src/dbsettings.cpp | 4 ++--
plugins/Dbx_mdbx/src/stdafx.h | 8 ++++----
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/plugins/Dbx_mdbx/src/dbcheck.cpp b/plugins/Dbx_mdbx/src/dbcheck.cpp
index c15b6aee4c..f1e50414de 100644
--- a/plugins/Dbx_mdbx/src/dbcheck.cpp
+++ b/plugins/Dbx_mdbx/src/dbcheck.cpp
@@ -52,7 +52,7 @@ int CDbxMDBX::CheckEvents1(void)
}
}
- trnlck.commit();
+ trnlck.Commit();
return 0;
}
@@ -74,7 +74,7 @@ int CDbxMDBX::CheckEvents2(void)
}
}
- trnlck.commit();
+ trnlck.Commit();
return 0;
}
@@ -100,6 +100,6 @@ int CDbxMDBX::CheckEvents3(void)
}
}
- trnlck.commit();
+ trnlck.Commit();
return 0;
}
diff --git a/plugins/Dbx_mdbx/src/dbcontacts.cpp b/plugins/Dbx_mdbx/src/dbcontacts.cpp
index 3cfca21013..67e5d2be6f 100644
--- a/plugins/Dbx_mdbx/src/dbcontacts.cpp
+++ b/plugins/Dbx_mdbx/src/dbcontacts.cpp
@@ -70,7 +70,7 @@ LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
}
}
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
@@ -92,7 +92,7 @@ LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
return 1;
}
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
@@ -103,7 +103,7 @@ LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
txn_ptr trnlck(StartTran());
if (mdbx_del(trnlck, m_dbContacts, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
@@ -125,7 +125,7 @@ MCONTACT CDbxMDBX::AddContact()
txn_ptr trnlck(StartTran());
if (mdbx_put(trnlck, m_dbContacts, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return 0;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 0;
}
@@ -173,7 +173,7 @@ BOOL CDbxMDBX::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
if (mdbx_put(trnlck, m_dbEventsSort, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
ccMeta->dbc.dwEventCount++;
@@ -183,7 +183,7 @@ BOOL CDbxMDBX::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
txn_ptr trnlck(StartTran());
if (mdbx_put(trnlck, m_dbContacts, &keyc, &datac, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
DBFlush();
@@ -203,7 +203,7 @@ BOOL CDbxMDBX::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
MDBX_val key = { &insVal, sizeof(insVal) };
if (mdbx_del(trnlck, m_dbEventsSort, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
ccMeta->dbc.dwEventCount--;
@@ -213,7 +213,7 @@ BOOL CDbxMDBX::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
MDBX_val keyc = { &ccMeta->contactID, sizeof(MCONTACT) }, datac = { &ccMeta->dbc, sizeof(ccMeta->dbc) };
if (mdbx_put(trnlck, m_dbContacts, &keyc, &datac, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
DBFlush();
@@ -246,7 +246,7 @@ BOOL CDbxMDBX::MetaRemoveSubHistory(DBCachedContact *ccSub)
return 1;
}
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
diff --git a/plugins/Dbx_mdbx/src/dbcrypt.cpp b/plugins/Dbx_mdbx/src/dbcrypt.cpp
index 61a7b13dd1..1d86211318 100644
--- a/plugins/Dbx_mdbx/src/dbcrypt.cpp
+++ b/plugins/Dbx_mdbx/src/dbcrypt.cpp
@@ -110,7 +110,7 @@ CRYPTO_PROVIDER* CDbxMDBX::SelectProvider()
if (mdbx_put(trnlck, m_dbCrypto, &key, &value, MDBX_UPSERT) != MDBX_SUCCESS)
return nullptr;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return nullptr;
}
@@ -276,7 +276,7 @@ void CDbxMDBX::StoreKey()
MDBX_val key = { DBKey_Crypto_Key, sizeof(DBKey_Crypto_Key) }, value = { pKey, iKeyLength };
int rc = mdbx_put(trnlck, m_dbCrypto, &key, &value, MDBX_UPSERT);
if (rc == MDBX_SUCCESS)
- rc = trnlck.commit();
+ rc = trnlck.Commit();
/* FIXME: throw an exception */
assert(rc == MDBX_SUCCESS);
UNREFERENCED_PARAMETER(rc);
@@ -371,7 +371,7 @@ int CDbxMDBX::EnableEncryption(bool bEncrypted)
}
lstEvents.erase(lstEvents.begin(), lstEvents.begin()+portion);
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
while (lstEvents.size() > 0);
@@ -380,7 +380,7 @@ int CDbxMDBX::EnableEncryption(bool bEncrypted)
MDBX_val key = { DBKey_Crypto_IsEncrypted, sizeof(DBKey_Crypto_IsEncrypted) }, value = { &bEncrypted, sizeof(bool) };
if (mdbx_put(trnlck, m_dbCrypto, &key, &value, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
DBFlush();
diff --git a/plugins/Dbx_mdbx/src/dbevents.cpp b/plugins/Dbx_mdbx/src/dbevents.cpp
index 3114962438..ff94225bed 100644
--- a/plugins/Dbx_mdbx/src/dbevents.cpp
+++ b/plugins/Dbx_mdbx/src/dbevents.cpp
@@ -131,7 +131,7 @@ BOOL CDbxMDBX::DeleteEvent(MEVENT hDbEvent)
if (mdbx_del(trnlck, m_dbEvents, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
@@ -274,7 +274,7 @@ bool CDbxMDBX::EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO
return false;
}
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return false;
}
@@ -448,7 +448,7 @@ BOOL CDbxMDBX::MarkEventRead(MCONTACT contactID, MEVENT hDbEvent)
return -1;
}
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return -1;
}
diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp
index 45e8b038cd..7faf1328eb 100644
--- a/plugins/Dbx_mdbx/src/dbintf.cpp
+++ b/plugins/Dbx_mdbx/src/dbintf.cpp
@@ -98,7 +98,7 @@ int CDbxMDBX::Load()
if (mdbx_get(trnlck, m_dbGlobal, &key, &data) == MDBX_SUCCESS)
m_ccDummy.dbc = *(const DBContact*)data.iov_base;
- trnlck.commit();
+ trnlck.Commit();
}
mdbx_txn_begin(m_env, nullptr, MDBX_TXN_RDONLY, &m_txn_ro);
diff --git a/plugins/Dbx_mdbx/src/dbmodulechain.cpp b/plugins/Dbx_mdbx/src/dbmodulechain.cpp
index 655937a0bc..4799b1e6f9 100644
--- a/plugins/Dbx_mdbx/src/dbmodulechain.cpp
+++ b/plugins/Dbx_mdbx/src/dbmodulechain.cpp
@@ -50,7 +50,7 @@ uint32_t CDbxMDBX::GetModuleID(const char *szName)
txn_ptr trnlck(StartTran());
if (mdbx_put(trnlck, m_dbModules, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return -1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return -1;
}
diff --git a/plugins/Dbx_mdbx/src/dbsettings.cpp b/plugins/Dbx_mdbx/src/dbsettings.cpp
index cc125a811f..0387b69ad6 100644
--- a/plugins/Dbx_mdbx/src/dbsettings.cpp
+++ b/plugins/Dbx_mdbx/src/dbsettings.cpp
@@ -343,7 +343,7 @@ LBL_WriteString:
if (mdbx_put(trnlck, m_dbSettings, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
@@ -377,7 +377,7 @@ BOOL CDbxMDBX::DeleteContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR
MDBX_val key = { keyVal, sizeof(DBSettingKey) + settingNameLen };
if (mdbx_del(trnlck, m_dbSettings, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.commit() != MDBX_SUCCESS)
+ if (trnlck.Commit() != MDBX_SUCCESS)
return 1;
}
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 424f3cd4f3..a8918e9b80 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -70,25 +70,25 @@ public:
{
if (txn) {
/* FIXME: see https://github.com/leo-yuriev/libfpta/blob/77a7251fde2030165a3916ee68fd86a1374b3dd8/src/common.cxx#L370 */
- abort();
+ Abort();
}
}
__forceinline operator MDBX_txn*() const { return txn; }
- __forceinline int commit()
+ __forceinline int Commit()
{
int rc = mdbx_txn_commit(txn);
if (rc != MDBX_SUCCESS) {
/* FIXME: throw an exception */
- abort();
+ Abort();
return rc;
}
txn = nullptr;
return MDBX_SUCCESS;
}
- __forceinline void abort()
+ __forceinline void Abort()
{
int rc = mdbx_txn_abort(txn);
/* FIXME: throw an exception */
--
cgit v1.2.3