diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:39:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:39:01 +0000 |
| commit | 4a6b3a2acf91421a958b9946e15a149cac29e7b5 (patch) | |
| tree | 88860b2bf9b9a85c932c7dd2c2e73445d200745c /plugins/Db3x_mmap/src | |
| parent | d0ceb5768ff3146499a0318ffe03c867c0845592 (diff) | |
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@14980 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Db3x_mmap/src')
| -rw-r--r-- | plugins/Db3x_mmap/src/dbcrypt.cpp | 6 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/dbsettings.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp index f95a704439..ef1bf5075a 100644 --- a/plugins/Db3x_mmap/src/dbcrypt.cpp +++ b/plugins/Db3x_mmap/src/dbcrypt.cpp @@ -342,13 +342,13 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID) for (int i = 0; i < arSettings.getCount(); i++) {
VarDescr &p = arSettings[i];
if (!m_bEncrypted) {
- size_t len;
- BYTE *pResult = m_crypto->encodeString(p.szValue, &len);
+ size_t encodedLen;
+ BYTE *pResult = m_crypto->encodeString(p.szValue, &encodedLen);
if (pResult != NULL) {
DBCONTACTWRITESETTING dbcws = { szModule, p.szVar };
dbcws.value.type = DBVT_ENCRYPTED;
dbcws.value.pbVal = pResult;
- dbcws.value.cpbVal = (WORD)len;
+ dbcws.value.cpbVal = (WORD)encodedLen;
WriteContactSetting(contactID, &dbcws);
mir_free(pResult);
diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index b04f219815..4e444eaa67 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -216,7 +216,7 @@ LBL_Seek: /**** add to cache **********************/
if (iType != DBVT_BLOB && iType != DBVT_ENCRYPTED) {
- DBVARIANT *pCachedValue = m_cache->GetCachedValuePtr(contactID, szCachedSettingName, 1);
+ pCachedValue = m_cache->GetCachedValuePtr(contactID, szCachedSettingName, 1);
if (pCachedValue != NULL) {
m_cache->SetCachedVariant(dbv, pCachedValue);
log3("set cached [%08p] %s (%p)", hContact, szCachedSettingName, pCachedValue);
|