diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2016-07-03 17:19:54 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2016-07-03 17:19:54 +0000 |
| commit | ed204fe350540966e492859c9f9c734b6b9f1cde (patch) | |
| tree | 33be33ad2c5e903ca037fdeef82e1e4b2a9a4b62 /plugins/Dbx_mdb/src/dbsettings.cpp | |
| parent | be556ddb9cca86b4242781761019da7ba6a537d0 (diff) | |
dbx_lmdb: code optimization
git-svn-id: http://svn.miranda-ng.org/main/trunk@17057 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Dbx_mdb/src/dbsettings.cpp')
| -rw-r--r-- | plugins/Dbx_mdb/src/dbsettings.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/plugins/Dbx_mdb/src/dbsettings.cpp b/plugins/Dbx_mdb/src/dbsettings.cpp index ec9a2549be..95faa27a68 100644 --- a/plugins/Dbx_mdb/src/dbsettings.cpp +++ b/plugins/Dbx_mdb/src/dbsettings.cpp @@ -107,7 +107,7 @@ LBL_Seek: DBSettingKey *keyVal = (DBSettingKey *)_alloca(sizeof(DBSettingKey) + settingNameLen + 1);
keyVal->hContact = contactID;
- keyVal->dwModuleId = GetModuleNameOfs(szModule);
+ keyVal->dwModuleId = GetModuleID(szModule);
memcpy(&keyVal->szSettingName, szSetting, settingNameLen + 1);
@@ -459,7 +459,7 @@ STDMETHODIMP_(BOOL) CDbxMdb::WriteContactSetting(MCONTACT contactID, DBCONTACTWR DBSettingKey *keyVal = (DBSettingKey *)_alloca(sizeof(DBSettingKey) + settingNameLen + 1);
keyVal->hContact = contactID;
- keyVal->dwModuleId = GetModuleNameOfs(dbcws->szModule);
+ keyVal->dwModuleId = GetModuleID(dbcws->szModule);
memcpy(&keyVal->szSettingName, dbcws->szSetting, settingNameLen + 1);
@@ -527,7 +527,7 @@ STDMETHODIMP_(BOOL) CDbxMdb::DeleteContactSetting(MCONTACT contactID, LPCSTR szM {
DBSettingKey *keyVal = (DBSettingKey*)_alloca(sizeof(DBSettingKey) + settingNameLen + 1);
keyVal->hContact = contactID;
- keyVal->dwModuleId = GetModuleNameOfs(szModule);
+ keyVal->dwModuleId = GetModuleID(szModule);
memcpy(&keyVal->szSettingName, szSetting, settingNameLen + 1);
MDB_val key = { sizeof(DBSettingKey) + settingNameLen + 1, keyVal };
@@ -556,19 +556,16 @@ STDMETHODIMP_(BOOL) CDbxMdb::EnumContactSettings(MCONTACT contactID, DBCONTACTEN {
int result = -1;
- DBSettingKey keySearch = { 0 };
- keySearch.hContact = contactID;
- keySearch.dwModuleId = GetModuleNameOfs(dbces->szModule);
-
+ DBSettingKey keyVal = { contactID, GetModuleID(dbces->szModule) };
txn_ptr_ro txn(m_txn);
cursor_ptr_ro cursor(m_curSettings);
- MDB_val key = { sizeof(keySearch), &keySearch }, data;
+ MDB_val key = { sizeof(keyVal), &keyVal }, data;
for (int res = mdb_cursor_get(cursor, &key, &data, MDB_SET_RANGE); res == MDB_SUCCESS; res = mdb_cursor_get(cursor, &key, &data, MDB_NEXT))
{
const DBSettingKey *pKey = (const DBSettingKey*)key.mv_data;
- if (pKey->hContact != contactID || pKey->dwModuleId != keySearch.dwModuleId)
+ if (pKey->hContact != contactID || pKey->dwModuleId != keyVal.dwModuleId)
break;
result = (dbces->pfnEnumProc)(pKey->szSettingName, dbces->lParam);
}
|