diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 18:37:53 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 18:37:53 +0000 |
commit | e2d7ebd6315a810bd4ea54f1088b84d09c3ca5d2 (patch) | |
tree | 736bb8768f17b26904cdf8e0fe6fb47e1dcb892e /protocols/MSN | |
parent | a882eddcba5fd22adab1454c8d2ff9c224bc7aa7 (diff) |
replace stricmp to mir_strcmpi
git-svn-id: http://svn.miranda-ng.org/main/trunk@13760 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN')
-rw-r--r-- | protocols/MSN/src/msn_chat.cpp | 4 | ||||
-rw-r--r-- | protocols/MSN/src/msn_commands.cpp | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index b7d5bf52ab..bc84f3ad64 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -130,7 +130,7 @@ void CMsnProto::MSN_ChatStart(ezxml_t xmli) if (pszCreator && !mir_strcmp(mri, pszCreator)) info->mCreator = gcu;
char* szEmail, *szNet;
parseWLID(NEWSTR_ALLOCA(mri), &szNet, &szEmail, NULL);
- if (!stricmp(szEmail, GetMyUsername(atoi(szNet))))
+ if (!mir_strcmpi(szEmail, GetMyUsername(atoi(szNet))))
info->mMe = gcu;
gcu->btag = 1;
}
@@ -248,7 +248,7 @@ void CMsnProto::MSN_GCProcessThreadActivity(ezxml_t xmli, const TCHAR *mChatID) }
char* szEmail, *szNet;
parseWLID(NEWSTR_ALLOCA(pszTarget), &szNet, &szEmail, NULL);
- gce.bIsMe = !stricmp(szEmail, GetMyUsername(atoi(szNet)));
+ gce.bIsMe = !mir_strcmpi(szEmail, GetMyUsername(atoi(szNet)));
gce.ptszUID = mir_a2t(pszTarget);
MCONTACT hContTarget = MSN_HContactFromEmail(pszTarget);
gce.ptszNick =GetContactNameT(hContTarget);
diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 33903878c2..e460d2942d 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -100,12 +100,12 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para if (sdgMsg) {
msgBytes = atol(datas.strMsgBytes);
- if (stricmp(datas.typeId, "MSGR"))
+ if (mir_strcmpi(datas.typeId, "MSGR"))
return;
}
else if (nfyMsg) {
msgBytes = atol(datas.strMsgBytes);
- if (stricmp(datas.typeId, "MSGR\\HOTMAIL"))
+ if (mir_strcmpi(datas.typeId, "MSGR\\HOTMAIL"))
return;
}
else {
@@ -400,13 +400,13 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para char *szEmail, *szInst;
parseWLID(NEWSTR_ALLOCA(dest), NULL, &szEmail, &szInst);
- if (stricmp(szEmail, MyOptions.szEmail) == 0) {
+ if (mir_strcmpi(szEmail, MyOptions.szEmail) == 0) {
const char* src = tHeader["P2P-Src"];
if (src == NULL) src = email;
if (szInst == NULL)
p2p_processMsg(info, msgBody, src);
- else if (stricmp(szInst, MyOptions.szMachineGuidP2P) == 0)
+ else if (mir_strcmpi(szInst, MyOptions.szMachineGuidP2P) == 0)
p2p_processMsgV2(info, msgBody, src);
}
}
@@ -488,7 +488,7 @@ void CMsnProto::MSN_ProcessNLN(const char *userStatus, const char *wlid, char *u bool isMe = false;
char* szEmail, *szNet;
parseWLID(NEWSTR_ALLOCA(wlid), &szNet, &szEmail, NULL);
- if (!stricmp(szEmail, GetMyUsername(atoi(szNet)))) {
+ if (!mir_strcmpi(szEmail, GetMyUsername(atoi(szNet)))) {
if (!*userStatus) return;
isMe = true;
int newStatus = MSNStatusToMiranda(userStatus);
@@ -549,7 +549,7 @@ void CMsnProto::MSN_ProcessNLN(const char *userStatus, const char *wlid, char *u if (hContact != NULL) {
char szSavedHash[64] = "";
db_get_static(hContact, m_szModuleName, "AvatarSavedHash", szSavedHash, sizeof(szSavedHash));
- if (stricmp(szSavedHash, pszAvatarHash))
+ if (mir_strcmpi(szSavedHash, pszAvatarHash))
pushAvatarRequest(hContact, pszUrl);
else {
char szSavedContext[64];
@@ -1000,7 +1000,7 @@ LBL_InvalidCommand: if ((id=ezxml_child(xmli, "id")))
{
bool bIsChat = strncmp(id->txt, "19:", 3)==0;
- bool bHasMore = stricmp(ezxml_txt(ezxml_child(xmli, "hasmore")), "true") == 0;
+ bool bHasMore = mir_strcmpi(ezxml_txt(ezxml_child(xmli, "hasmore")), "true") == 0;
ezxml_t syncstate;
hContact = MSN_HContactFromEmail(id->txt, NULL, false, false);
if (!bHasMore && hContact) db_unset(hContact, m_szModuleName, "syncTS");
@@ -1020,7 +1020,7 @@ LBL_InvalidCommand: ts=IsoToUnixTime(arrtime->txt);
parseWLID(NEWSTR_ALLOCA(from->txt), &netId, &email, NULL);
message=content->txt;
- sentMsg = stricmp(email, GetMyUsername(atoi(netId)))==0;
+ sentMsg = mir_strcmpi(email, GetMyUsername(atoi(netId)))==0;
if (msgtype) {
if (!mir_strcmp(msgtype->txt, "RichText")) {
message = NEWSTR_ALLOCA(message);
|