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 --- protocols/Yahoo/src/chat.cpp | 8 ++++---- protocols/Yahoo/src/proto.cpp | 8 ++++---- protocols/Yahoo/src/proto.h | 2 +- protocols/Yahoo/src/util.cpp | 4 ++-- protocols/Yahoo/src/yahoo.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'protocols/Yahoo') diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp index b99cd41887..39e584b655 100644 --- a/protocols/Yahoo/src/chat.cpp +++ b/protocols/Yahoo/src/chat.cpp @@ -63,7 +63,7 @@ void ext_yahoo_got_conf_invite(int id, const char *me, const char *who, const ch CYahooProto::ChatRoom *cm = ppro->m_chatrooms.find((CYahooProto::ChatRoom*)&room); if (!cm) { - if (strcmp(who, me)) + if (mir_strcmp(who, me)) { cm = new CYahooProto::ChatRoom(room, members); ppro->m_chatrooms.insert(cm); @@ -109,7 +109,7 @@ void ext_yahoo_conf_userjoin(int id, const char *me, const char *who, const char if (!cm) return; for (YList *l = cm->members; l; l = l->next) { - if (!strcmp(who, (char*)l->data)) + if (!mir_strcmp(who, (char*)l->data)) return; } @@ -127,7 +127,7 @@ void ext_yahoo_conf_userleave(int id, const char *me, const char *who, const cha for (YList *l = cm->members; l; l = l->next) { - if (strcmp((char*)l->data, who) == 0) + if (mir_strcmp((char*)l->data, who) == 0) { free(l->data); y_list_remove_link(cm->members, l); @@ -268,7 +268,7 @@ int __cdecl CYahooProto::OnGCEventHook(WPARAM, LPARAM lParam) GCHOOK *gch = (GCHOOK*) lParam; if (!gch) return 1; - if (strcmp(gch->pDest->pszModule, m_szModuleName)) return 0; + if (mir_strcmp(gch->pDest->pszModule, m_szModuleName)) return 0; char* room = mir_t2a(gch->pDest->ptszID); char* who = mir_t2a(gch->ptszUID); diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 6183eda35d..50fa071785 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -161,7 +161,7 @@ MCONTACT __cdecl CYahooProto::AddToListByEvent( int flags, int /*iContact*/, MEV return 0; } - if ( strcmp(dbei.szModule, m_szModuleName)) { + if ( mir_strcmp(dbei.szModule, m_szModuleName)) { debugLogA("[YahooAddToListByEvent] ERROR: Not Yahoo protocol."); return 0; } @@ -197,7 +197,7 @@ int CYahooProto::Authorize(MEVENT hdbe) if (dbei.eventType != EVENTTYPE_AUTHREQUEST) return 1; - if ( strcmp(dbei.szModule, m_szModuleName)) + if ( mir_strcmp(dbei.szModule, m_szModuleName)) return 1; /* Need to remove the buddy from our Miranda Lists */ @@ -240,7 +240,7 @@ int CYahooProto::AuthDeny(MEVENT hdbe, const TCHAR *reason) return 1; } - if (strcmp( dbei.szModule, m_szModuleName)) { + if (mir_strcmp( dbei.szModule, m_szModuleName)) { debugLogA("YahooAuthDeny - wrong module?"); return 1; } @@ -610,7 +610,7 @@ int __cdecl CYahooProto::UserIsTyping(MCONTACT hContact, int type) return 0; char *szProto = GetContactProto(hContact); - if (szProto == NULL || strcmp(szProto, m_szModuleName)) + if (szProto == NULL || mir_strcmp(szProto, m_szModuleName)) return 0; DBVARIANT dbv; diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h index f1fa073687..f1bb3ee42f 100644 --- a/protocols/Yahoo/src/proto.h +++ b/protocols/Yahoo/src/proto.h @@ -111,7 +111,7 @@ struct CYahooProto : public PROTO free(name); y_list_free(members); } static int compare(const ChatRoom* c1, const ChatRoom* c2) - { return strcmp(c1->name, c2->name); } + { return mir_strcmp(c1->name, c2->name); } }; OBJLIST m_chatrooms; diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp index 7a3da1782f..e80e27feb2 100644 --- a/protocols/Yahoo/src/util.cpp +++ b/protocols/Yahoo/src/util.cpp @@ -158,7 +158,7 @@ int __cdecl CYahooProto::OnSettingChanged(WPARAM hContact, LPARAM lParam) return 0; DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - if ( !strcmp(cws->szSetting, "ApparentMode")) { + if ( !mir_strcmp(cws->szSetting, "ApparentMode")) { debugLogA("DB Setting changed. YAHOO user's visible setting changed."); DBVARIANT dbv; @@ -177,7 +177,7 @@ bool CYahooProto::IsMyContact(MCONTACT hContact) return false; char* szProto = GetContactProto(hContact); - return szProto && !strcmp(szProto, m_szModuleName); + return szProto && !mir_strcmp(szProto, m_szModuleName); } extern PLUGININFOEX pluginInfo; diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index b0fb7b6aa5..3f70ae957a 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -771,10 +771,10 @@ void CYahooProto::ext_contact_added(const char *myid, const char *who, const cha hContact = add_buddy(who, nick, protocol, PALF_TEMPORARY); - if (strcmp(nick, who) != 0) + if (mir_strcmp(nick, who) != 0) SetStringUtf(hContact, "Nick", nick); - if (strcmp(myid, m_yahoo_id)) + if (mir_strcmp(myid, m_yahoo_id)) setString(hContact, "MyIdentity", myid); else delSetting(hContact, "MyIdentity"); -- cgit v1.2.3