From 95ce21d8512af00a4c5f607091a459b789f79b79 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:30:20 +0300 Subject: mmap: C++'11 iterators --- plugins/Db3x_mmap/src/dbcrypt.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'plugins/Db3x_mmap/src/dbcrypt.cpp') diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp index e04cc9b7be..777baae06e 100644 --- a/plugins/Db3x_mmap/src/dbcrypt.cpp +++ b/plugins/Db3x_mmap/src/dbcrypt.cpp @@ -91,13 +91,11 @@ void sttContactEnum(MCONTACT contactID, const char *szModule, CDb3Mmap *db) SettingUgraderParam param = { db, szModule, contactID, &arSettings }; db->EnumContactSettings(0, sttSettingUgrader, szModule, ¶m); - for (int i = 0; i < arSettings.getCount(); i++) { - VarDescr &p = arSettings[i]; - + for (auto &p : arSettings) { size_t len; - BYTE *pResult = db->m_crypto->encodeString(p.szValue, &len); + BYTE *pResult = db->m_crypto->encodeString(p->szValue, &len); if (pResult != nullptr) { - DBCONTACTWRITESETTING dbcws = { szModule, p.szVar }; + DBCONTACTWRITESETTING dbcws = { szModule, p->szVar }; dbcws.value.type = DBVT_ENCRYPTED; dbcws.value.pbVal = pResult; dbcws.value.cpbVal = (WORD)len; @@ -340,13 +338,12 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID) NeedBytes(1); } - for (int i = 0; i < arSettings.getCount(); i++) { - VarDescr &p = arSettings[i]; + for (auto &p : arSettings) { if (!m_bEncrypted) { size_t encodedLen; - BYTE *pResult = m_crypto->encodeString(p.szValue, &encodedLen); + BYTE *pResult = m_crypto->encodeString(p->szValue, &encodedLen); if (pResult != nullptr) { - DBCONTACTWRITESETTING dbcws = { szModule, p.szVar }; + DBCONTACTWRITESETTING dbcws = { szModule, p->szVar }; dbcws.value.type = DBVT_ENCRYPTED; dbcws.value.pbVal = pResult; dbcws.value.cpbVal = (WORD)encodedLen; @@ -357,9 +354,9 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID) } else { size_t realLen; - ptrA decoded(m_crypto->decodeString((PBYTE)(char*)p.szValue, p.iLen, &realLen)); + ptrA decoded(m_crypto->decodeString((PBYTE)(char*)p->szValue, p->iLen, &realLen)); if (decoded != nullptr) { - DBCONTACTWRITESETTING dbcws = { szModule, p.szVar }; + DBCONTACTWRITESETTING dbcws = { szModule, p->szVar }; dbcws.value.type = DBVT_UNENCRYPTED; dbcws.value.pszVal = decoded; dbcws.value.cchVal = (WORD)realLen; -- cgit v1.2.3