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 --- src/modules/protocols/protochains.cpp | 2 +- src/modules/protocols/protocols.cpp | 6 +++--- src/modules/protocols/protodir.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/modules/protocols') diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp index bc94b9cc25..be760d9877 100644 --- a/src/modules/protocols/protochains.cpp +++ b/src/modules/protocols/protochains.cpp @@ -197,7 +197,7 @@ static INT_PTR Proto_IsProtoOnContact(WPARAM wParam, LPARAM lParam) return -1; for (int i = 0; i < filters.getCount(); i++) - if (!strcmp(szProto, filters[i]->szName)) + if (!mir_strcmp(szProto, filters[i]->szName)) return i + 1; return 0; diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index 526b767328..a3108365bf 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -40,7 +40,7 @@ TServiceListItem; static int CompareServiceItems(const TServiceListItem* p1, const TServiceListItem* p2) { - return strcmp(p1->name, p2->name); + return mir_strcmp(p1->name, p2->name); } static LIST serviceItems(10, CompareServiceItems); @@ -52,7 +52,7 @@ static int CompareProtos(const PROTOCOLDESCRIPTOR *p1, const PROTOCOLDESCRIPTOR if (p1->type != p2->type) return p1->type - p2->type; - return strcmp(p1->szName, p2->szName); + return mir_strcmp(p1->szName, p2->szName); } LIST filters(10, CompareProtos); @@ -513,7 +513,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char } } - if (!strcmp(szService, PS_ADDTOLIST)) { + if (!mir_strcmp(szService, PS_ADDTOLIST)) { PROTOSEARCHRESULT *psr = (PROTOSEARCHRESULT*)lParam; if (!(psr->flags & PSR_UNICODE)) { PROTOSEARCHRESULT *psra = (PROTOSEARCHRESULT*)mir_alloc(psr->cbSize); diff --git a/src/modules/protocols/protodir.cpp b/src/modules/protocols/protodir.cpp index 96f442dfc8..0ce11742ed 100644 --- a/src/modules/protocols/protodir.cpp +++ b/src/modules/protocols/protodir.cpp @@ -75,10 +75,10 @@ int contactCacheCompare(void * a, void * b) contactEntry * y = (contactEntry *) b; int rc=0; // same protocol? - rc = strcmp(x->proto, y->proto); + rc = mir_strcmp(x->proto, y->proto); if ( rc == 0 ) { // same id? id's might be missing - if ( x->id && y->id ) rc = strcmp(x->id, y->id); + if ( x->id && y->id ) rc = mir_strcmp(x->id, y->id); } return rc; } @@ -96,7 +96,7 @@ int protoCacheCompare(void * a, void * b) // keeps a list of protocol names int protoNameCacheCompare(void * a, void * b) { - return strcmp( (char *)a, (char*)b ); + return mir_strcmp( (char *)a, (char*)b ); } // cache the protocol string so that its not allocated per contact but shared -- cgit v1.2.3