summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_proto.cpp
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-05-22 10:06:32 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-05-22 10:06:32 +0000
commit5a17c9299e03bebf46169927abdeee34aaf8e854 (patch)
treecbd13080f33ac0b6396b9d3b8ba31a3c98de59f8 /protocols/JabberG/src/jabber_proto.cpp
parented64312924e77707e7e5b5965c301692519f293a (diff)
replace strlen to mir_strlen
git-svn-id: http://svn.miranda-ng.org/main/trunk@13747 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
-rw-r--r--protocols/JabberG/src/jabber_proto.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index a7663e7624..0df2add95a 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -365,9 +365,9 @@ MCONTACT __cdecl CJabberProto::AddToListByEvent(int flags, int /*iContact*/, MEV
return NULL;
char *nick = (char*)(dbei.pBlob + sizeof(DWORD)*2);
- char *firstName = nick + strlen(nick) + 1;
- char *lastName = firstName + strlen(firstName) + 1;
- char *jid = lastName + strlen(lastName) + 1;
+ char *firstName = nick + mir_strlen(nick) + 1;
+ char *lastName = firstName + mir_strlen(firstName) + 1;
+ char *jid = lastName + mir_strlen(lastName) + 1;
TCHAR *newJid = (dbei.flags & DBEF_UTF) ? mir_utf8decodeT(jid) : mir_a2t(jid);
MCONTACT hContact = (MCONTACT)AddToListByJID(newJid, flags);
@@ -396,9 +396,9 @@ int CJabberProto::Authorize(MEVENT hDbEvent)
return 1;
char *nick = (char*)(dbei.pBlob + sizeof(DWORD)*2);
- char *firstName = nick + strlen(nick) + 1;
- char *lastName = firstName + strlen(firstName) + 1;
- char *jid = lastName + strlen(lastName) + 1;
+ char *firstName = nick + mir_strlen(nick) + 1;
+ char *lastName = firstName + mir_strlen(firstName) + 1;
+ char *jid = lastName + mir_strlen(lastName) + 1;
debugLog(_T("Send 'authorization allowed' to %s"), jid);
@@ -450,9 +450,9 @@ int CJabberProto::AuthDeny(MEVENT hDbEvent, const TCHAR*)
return 1;
char *nick = (char*)(dbei.pBlob + sizeof(DWORD)*2);
- char *firstName = nick + strlen(nick) + 1;
- char *lastName = firstName + strlen(firstName) + 1;
- char *jid = lastName + strlen(lastName) + 1;
+ char *firstName = nick + mir_strlen(nick) + 1;
+ char *lastName = firstName + mir_strlen(firstName) + 1;
+ char *jid = lastName + mir_strlen(lastName) + 1;
debugLogA("Send 'authorization denied' to %s", jid);
@@ -966,11 +966,11 @@ int __cdecl CJabberProto::SendMsg(MCONTACT hContact, int, const char* pszSrc)
}
int isEncrypted, id = SerialNext();
- if (!strncmp(pszSrc, PGP_PROLOG, strlen(PGP_PROLOG))) {
+ if (!strncmp(pszSrc, PGP_PROLOG, mir_strlen(PGP_PROLOG))) {
const char *szEnd = strstr(pszSrc, PGP_EPILOG);
- char *tempstring = (char*)alloca(strlen(pszSrc) + 1);
- size_t nStrippedLength = strlen(pszSrc) - strlen(PGP_PROLOG) - (szEnd ? strlen(szEnd) : 0);
- strncpy_s(tempstring, nStrippedLength, pszSrc + strlen(PGP_PROLOG), _TRUNCATE);
+ char *tempstring = (char*)alloca(mir_strlen(pszSrc) + 1);
+ size_t nStrippedLength = mir_strlen(pszSrc) - mir_strlen(PGP_PROLOG) - (szEnd ? mir_strlen(szEnd) : 0);
+ strncpy_s(tempstring, nStrippedLength, pszSrc + mir_strlen(PGP_PROLOG), _TRUNCATE);
tempstring[nStrippedLength] = 0;
pszSrc = tempstring;
isEncrypted = 1;