From 5a17c9299e03bebf46169927abdeee34aaf8e854 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Fri, 22 May 2015 10:06:32 +0000
Subject: replace strlen to mir_strlen

git-svn-id: http://svn.miranda-ng.org/main/trunk@13747 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/YAMN/src/mails/decode.cpp |  4 ++--
 plugins/YAMN/src/mails/mails.cpp  |  2 +-
 plugins/YAMN/src/mails/mime.cpp   | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'plugins/YAMN/src/mails')

diff --git a/plugins/YAMN/src/mails/decode.cpp b/plugins/YAMN/src/mails/decode.cpp
index 64bbc47ad1..f2a0837e7b 100644
--- a/plugins/YAMN/src/mails/decode.cpp
+++ b/plugins/YAMN/src/mails/decode.cpp
@@ -227,7 +227,7 @@ int GetCharsetFromString(char *input,size_t size)
 	DebugLog(DecodeFile,"<CodePage>%s</CodePage>",pout);
 #endif
 	for (int i=0;i<CPLENALL;i++) {
-		size_t len = strlen(CodePageNamesAll[i].NameBase);
+		size_t len = mir_strlen(CodePageNamesAll[i].NameBase);
 		if (0==strncmp(pout,CodePageNamesAll[i].NameBase,len)) {
 			if (0==strcmp(pout+len,CodePageNamesAll[i].NameSub)) {
 				delete[] pout;
@@ -527,7 +527,7 @@ void ConvertCodedStringToUnicode(char *stream,WCHAR **storeto,DWORD cp,int mode)
 						finderend=pcodeend+2;
 					if (WS(finderend))	//if string continues and there's some whitespace, add space to string that is to be converted
 					{
-						size_t len=strlen(DecodedResult);
+						size_t len=mir_strlen(DecodedResult);
 						DecodedResult[len]=' ';
 						DecodedResult[len+1]=0;
 						finderend++;
diff --git a/plugins/YAMN/src/mails/mails.cpp b/plugins/YAMN/src/mails/mails.cpp
index c3e3a85130..53d7d54535 100644
--- a/plugins/YAMN/src/mails/mails.cpp
+++ b/plugins/YAMN/src/mails/mails.cpp
@@ -472,7 +472,7 @@ HYAMNMAIL WINAPI CreateNewDeleteQueueFcn(HYAMNMAIL From)
 				Browser->Next=new YAMNMAIL;
 				Browser=Browser->Next;
 			}
-			Browser->ID=new char[strlen(From->ID)+1];
+			Browser->ID=new char[mir_strlen(From->ID)+1];
 			strcpy(Browser->ID,From->ID);
 			Browser->Number=From->Number;
 			Browser->Flags=From->Flags;
diff --git a/plugins/YAMN/src/mails/mime.cpp b/plugins/YAMN/src/mails/mime.cpp
index 0be13215dc..0c7449bf94 100644
--- a/plugins/YAMN/src/mails/mime.cpp
+++ b/plugins/YAMN/src/mails/mime.cpp
@@ -200,7 +200,7 @@ char *ExtractFromContentType(char *ContentType,char *value)
 	while((temp>ContentType) && WS(temp)) temp--;			//now we have to find, if the word "Charset=" is located after ';' like "; Charset="
 	if (*temp != ';' && !ENDLINE(temp) && temp != ContentType)
 		return NULL;
-	finder=finder+strlen(value);						//jump over value string
+	finder=finder+mir_strlen(value);						//jump over value string
 
 	while(WS(finder)) finder++;					//jump over whitespaces
 	temp=finder;
@@ -301,7 +301,7 @@ void ExtractShortHeader(struct CMimeItem *items,struct CShortHeader *head)
 			ToLower(ContentType);
 			if (NULL != (CharSetStr=ExtractFromContentType(ContentType,"charset=")))
 			{
-				head->CP=GetCharsetFromString(CharSetStr,strlen(CharSetStr));
+				head->CP=GetCharsetFromString(CharSetStr,mir_strlen(CharSetStr));
 				delete[] CharSetStr;
 			}
 			delete[] ContentType;
@@ -505,7 +505,7 @@ struct APartDataType
 
 void ParseAPart(APartDataType *data)
 {
-	size_t len = strlen(data->Src);
+	size_t len = mir_strlen(data->Src);
 	try
 	{
 		char *finder=data->Src;
@@ -581,7 +581,7 @@ void ParseAPart(APartDataType *data)
 	{
 		MessageBox(NULL, TranslateT("Translate header error"), _T(""), 0);
 	}
-	if (data->body) data->bodyLen = (int)strlen(data->body);
+	if (data->body) data->bodyLen = (int)mir_strlen(data->body);
 }
 
 //from decode.cpp
@@ -592,7 +592,7 @@ int ConvertStringToUnicode(char *stream,unsigned int cp,WCHAR **out);
 WCHAR *ParseMultipartBody(char *src, char *bond)
 {
 	char *srcback = _strdup(src);
-	size_t sizebond = strlen(bond);
+	size_t sizebond = mir_strlen(bond);
 	int numparts = 1;
 	int i;
 	char *courbond = srcback;
@@ -618,7 +618,7 @@ WCHAR *ParseMultipartBody(char *src, char *bond)
 				char *CharSetStr;
 				if (NULL != (CharSetStr=ExtractFromContentType(partData[i].ContType,"charset=")))
 				{
-					partData[i].CodePage=GetCharsetFromString(CharSetStr,strlen(CharSetStr));
+					partData[i].CodePage=GetCharsetFromString(CharSetStr,mir_strlen(CharSetStr));
 					delete[] CharSetStr;
 				}
 			}
@@ -662,32 +662,32 @@ FailBackRaw:
 		if (i) { // part before first boudary should not have headers
 			char infoline[1024]; size_t linesize = 0;
 			mir_snprintf(infoline, SIZEOF(infoline), "%s %d", Translate("Part"), i);
-			linesize = strlen(infoline);
+			linesize = mir_strlen(infoline);
 			if (partData[i].TransEnc) {
 				mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", partData[i].TransEnc);
-				linesize = strlen(infoline);
+				linesize = mir_strlen(infoline);
 			}
 			if (partData[i].ContType) {
 				char *CharSetStr=strchr(partData[i].ContType,';');
 				if (CharSetStr) {
 					CharSetStr[0]=0;
 					mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", partData[i].ContType);
-					linesize = strlen(infoline);
+					linesize = mir_strlen(infoline);
 					partData[i].ContType=CharSetStr+1;
 					if (NULL != (CharSetStr=ExtractFromContentType(partData[i].ContType,"charset="))) {
 						mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", CharSetStr);
-						linesize = strlen(infoline);
+						linesize = mir_strlen(infoline);
 						delete[] CharSetStr;
 					}
 					if (NULL != (CharSetStr=ExtractFromContentType(partData[i].ContType,"name="))) {
 						mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; \"%s\"", CharSetStr);
-						linesize = strlen(infoline);
+						linesize = mir_strlen(infoline);
 						delete[] CharSetStr;
 					}
 				}
 				else {
 					mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", partData[i].ContType);
-					linesize = strlen(infoline);
+					linesize = mir_strlen(infoline);
 				}
 			}
 			mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, ".\r\n");
-- 
cgit v1.2.3