summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-05-24 12:20:50 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-05-24 12:20:50 +0000
commit5aed15a8d8d8e4f913539761be496e0d1ba2c4f0 (patch)
treedd9996ff223dc09154ed3c65d51ce528a9b2f81d /protocols
parent2cd063aa25c633f2bf4213e007bf2df5d610d8e1 (diff)
replace wcslen to mir_wstrlen
git-svn-id: http://svn.miranda-ng.org/main/trunk@13813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/AimOscar/src/conv.cpp4
-rw-r--r--protocols/IcqOscarJ/src/icq_db.cpp2
-rw-r--r--protocols/MSN/src/msn_mime.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/protocols/AimOscar/src/conv.cpp b/protocols/AimOscar/src/conv.cpp
index c63010341b..7f6d6f1a3e 100644
--- a/protocols/AimOscar/src/conv.cpp
+++ b/protocols/AimOscar/src/conv.cpp
@@ -804,7 +804,7 @@ char* rtf_to_html(HWND hwndDlg,int DlgItem)
void wcs_htons(wchar_t * ch)
{
if (ch == NULL) return;
- for(size_t i=0;i<wcslen(ch);i++)
+ for(size_t i=0;i<mir_wstrlen(ch);i++)
ch[i]=_htons(ch[i]);
}
@@ -888,7 +888,7 @@ aimString::aimString(char* str)
{
wszString = mir_utf8decodeW(str);
wcs_htons(wszString);
- size = wcslen(wszString) * sizeof(wchar_t);
+ size = mir_wstrlen(wszString) * sizeof(wchar_t);
}
else
{
diff --git a/protocols/IcqOscarJ/src/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp
index 9cee69b5c1..bafbfb8dda 100644
--- a/protocols/IcqOscarJ/src/icq_db.cpp
+++ b/protocols/IcqOscarJ/src/icq_db.cpp
@@ -149,7 +149,7 @@ void CIcqProto::setStatusMsgVar(MCONTACT hContact, char* szStatusMsg, bool isAns
if (isAnsi) {
char *szStatusNote = getSettingStringUtf(hContact, DBSETTING_STATUS_NOTE, "");
wchar_t *szStatusNoteW = make_unicode_string(szStatusNote);
- int len = (int)wcslen(szStatusNoteW) * 3 + 1;
+ int len = (int)mir_wstrlen(szStatusNoteW) * 3 + 1;
char *szStatusNoteAnsi = (char*)alloca(len);
WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, szStatusNoteW, -1, szStatusNoteAnsi, len, NULL, NULL);
bool notmatch = false;
diff --git a/protocols/MSN/src/msn_mime.cpp b/protocols/MSN/src/msn_mime.cpp
index 131e9bfd39..7c3274e6cf 100644
--- a/protocols/MSN/src/msn_mime.cpp
+++ b/protocols/MSN/src/msn_mime.cpp
@@ -394,7 +394,7 @@ static size_t utf8toutf16(char* str, wchar_t* res)
if (dec == NULL) dec = mir_a2u(str);
wcscpy(res, dec);
mir_free(dec);
- return wcslen(res);
+ return mir_wstrlen(res);
}