From 159b565b390687258ee65a3b66596e118752063c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:33:13 +0000 Subject: replace strcmp to mir_strcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13752 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Db3x_mmap/src/dbcontacts.cpp | 2 +- plugins/Db3x_mmap/src/dbintf.cpp | 4 ++-- plugins/Db3x_mmap/src/dbmodulechain.cpp | 2 +- plugins/Db3x_mmap/src/dbsettings.cpp | 24 ++++++++++++------------ plugins/Db3x_mmap/src/dbtool/modulechain.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/Db3x_mmap/src') diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index 7b93cd2c4a..d201b2cedd 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -37,7 +37,7 @@ int CDb3Mmap::CheckProto(DBCachedContact *cc, const char *proto) cc->szProto = m_cache->GetCachedSetting(NULL, protobuf, 0, (int)mir_strlen(protobuf)); } - return !strcmp(cc->szProto, proto); + return !mir_strcmp(cc->szProto, proto); } STDMETHODIMP_(LONG) CDb3Mmap::GetContactCount(void) diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index 72b5c7b9a7..db90cd1db1 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -31,7 +31,7 @@ DBSignature dbSignatureSD = { "Miranda ICQ SD", 0x1A }; static int ModCompare(const ModuleName *mn1, const ModuleName *mn2) { - return strcmp(mn1->name, mn2->name); + return mir_strcmp(mn1->name, mn2->name); } static int OfsCompare(const ModuleName *mn1, const ModuleName *mn2) @@ -41,7 +41,7 @@ static int OfsCompare(const ModuleName *mn1, const ModuleName *mn2) static int stringCompare2(const char *p1, const char *p2) { - return strcmp(p1, p2); + return mir_strcmp(p1, p2); } CDb3Mmap::CDb3Mmap(const TCHAR *tszFileName, int iMode) : diff --git a/plugins/Db3x_mmap/src/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp index db5e15ebed..6b2731747b 100644 --- a/plugins/Db3x_mmap/src/dbmodulechain.cpp +++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp @@ -63,7 +63,7 @@ int CDb3Mmap::InitModuleNames(void) DWORD CDb3Mmap::FindExistingModuleNameOfs(const char *szName) { ModuleName mn = { (char*)szName, 0 }; - if (m_lastmn && !strcmp(mn.name, m_lastmn->name)) + if (m_lastmn && !mir_strcmp(mn.name, m_lastmn->name)) return m_lastmn->ofs; int index = m_lMods.getIndex(&mn); diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index bf8c494c60..4abaf4d7aa 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -31,14 +31,14 @@ DBCachedContact* AddToCachedContactList(MCONTACT contactID, int index); BOOL CDb3Mmap::IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting) { if (!_strnicmp(szSetting, "password", 8)) return true; - if (!strcmp(szSetting, "NLProxyAuthPassword")) return true; - if (!strcmp(szSetting, "LNPassword")) return true; - if (!strcmp(szSetting, "FileProxyPassword")) return true; - if (!strcmp(szSetting, "TokenSecret")) return true; - - if (!strcmp(szModule, "SecureIM")) { - if (!strcmp(szSetting, "pgp")) return true; - if (!strcmp(szSetting, "pgpPrivKey")) return true; + if (!mir_strcmp(szSetting, "NLProxyAuthPassword")) return true; + if (!mir_strcmp(szSetting, "LNPassword")) return true; + if (!mir_strcmp(szSetting, "FileProxyPassword")) return true; + if (!mir_strcmp(szSetting, "TokenSecret")) return true; + + if (!mir_strcmp(szModule, "SecureIM")) { + if (!mir_strcmp(szSetting, "pgp")) return true; + if (!mir_strcmp(szSetting, "pgpPrivKey")) return true; } return false; } @@ -47,10 +47,10 @@ BOOL CDb3Mmap::IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting) static bool ValidLookupName(LPCSTR szModule, LPCSTR szSetting) { - if (!strcmp(szModule, META_PROTO)) - return strcmp(szSetting, "IsSubcontact") && strcmp(szSetting, "ParentMetaID"); + if (!mir_strcmp(szModule, META_PROTO)) + return mir_strcmp(szSetting, "IsSubcontact") && mir_strcmp(szSetting, "ParentMetaID"); - if (!strcmp(szModule, "Ignore")) + if (!mir_strcmp(szModule, "Ignore")) return false; return true; @@ -478,7 +478,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::WriteContactSetting(MCONTACT contactID, DBCONTACTW case DBVT_WORD: bIsIdentical = pCachedValue->wVal == dbcwWork.value.wVal; break; case DBVT_DWORD: bIsIdentical = pCachedValue->dVal == dbcwWork.value.dVal; break; case DBVT_UTF8: - case DBVT_ASCIIZ: bIsIdentical = strcmp(pCachedValue->pszVal, dbcwWork.value.pszVal) == 0; break; + case DBVT_ASCIIZ: bIsIdentical = mir_strcmp(pCachedValue->pszVal, dbcwWork.value.pszVal) == 0; break; } if (bIsIdentical) return 0; diff --git a/plugins/Db3x_mmap/src/dbtool/modulechain.cpp b/plugins/Db3x_mmap/src/dbtool/modulechain.cpp index 522532d8f4..c96d0b010e 100644 --- a/plugins/Db3x_mmap/src/dbtool/modulechain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/modulechain.cpp @@ -91,7 +91,7 @@ int CDb3Mmap::WorkModuleChain(int firstTime) // check duplicated modulenames int i, n = 0; for (i = iCurrentModName + 1; i < modChainCount; i++) - if (!strcmp(modChain[i].name, modChain[iCurrentModName].name)) { + if (!mir_strcmp(modChain[i].name, modChain[iCurrentModName].name)) { modChain[i].ofsNew = modChain[iCurrentModName].ofsNew; n++; } -- cgit v1.2.3