diff options
author | George Hazan <ghazan@miranda.im> | 2020-11-15 14:58:18 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2020-11-15 14:58:18 +0300 |
commit | efe255d24291ca83efa9caee3696a8f1451b3b11 (patch) | |
tree | 526e1c6ce5a93e537a2b9b1677eca11b656d8d97 /plugins/Dbx_mdbx/src/dbcontacts.cpp | |
parent | 93d2f6b311584f7fe92521abbc1285cb35f13def (diff) |
txn_ptr::abort() not to be mixed with common ::abort()
Diffstat (limited to 'plugins/Dbx_mdbx/src/dbcontacts.cpp')
-rw-r--r-- | plugins/Dbx_mdbx/src/dbcontacts.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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;
}
|