From 5a17c9299e03bebf46169927abdeee34aaf8e854 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky 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/IEView/src/Template.cpp | 8 ++++---- plugins/IEView/src/TemplateHTMLBuilder.cpp | 8 ++++---- plugins/IEView/src/TextToken.cpp | 2 +- plugins/IEView/src/Utils.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/IEView') diff --git a/plugins/IEView/src/Template.cpp b/plugins/IEView/src/Template.cpp index fbf87fc871..d405277f28 100644 --- a/plugins/IEView/src/Template.cpp +++ b/plugins/IEView/src/Template.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. TokenDef::TokenDef(const char *tokenString) { this->tokenString = tokenString; - this->tokenLen = (int)strlen(tokenString); + this->tokenLen = (int)mir_strlen(tokenString); this->token = 0; this->escape = 0; } @@ -33,7 +33,7 @@ TokenDef::TokenDef(const char *tokenString, int token, int escape) { this->tokenString = tokenString; this->token = token; - this->tokenLen = (int)strlen(tokenString); + this->tokenLen = (int)mir_strlen(tokenString); this->escape = escape; } @@ -170,7 +170,7 @@ void Template::tokenize() Token *lastToken = NULL; int lastTokenType = Token::PLAIN; int lastTokenEscape = 0; - int l = (int)strlen(str); + int l = (int)mir_strlen(str); for (int i = 0, lastTokenStart = 0; i <= l;) { Token *newToken; int newTokenType = 0, newTokenSize = 0, newTokenEscape = 0; @@ -339,7 +339,7 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename, { char lastTemplate[1024], tmp2[1024]; unsigned int i = 0; - if (filename == NULL || strlen(filename) == 0) + if (filename == NULL || mir_strlen(filename) == 0) return NULL; FILE *fh = fopen(filename, "rt"); diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index 09d042683c..d2267fdbba 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -177,7 +177,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr strcpy(tempBase, "file://"); strncat(tempBase, tmpm->getFilename(), SIZEOF(tempBase) - mir_strlen(tempBase)); - char *pathrun = tempBase + strlen(tempBase); + char *pathrun = tempBase + mir_strlen(tempBase); while ((*pathrun != '\\' && *pathrun != '/') && (pathrun > tempBase)) pathrun--; pathrun++; @@ -215,7 +215,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr szAvatarOut = mir_strdup(szNoAvatar); if (!db_get(event->hContact, "CList", "StatusMsg", &dbv)) { - if (strlen(dbv.pszVal) > 0) + if (mir_strlen(dbv.pszVal) > 0) szStatusMsg = mir_utf8encode(dbv.pszVal); db_free(&dbv); } @@ -348,7 +348,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, if (tmpm != NULL) { strcpy(tempBase, "file://"); strcat(tempBase, tmpm->getFilename()); - char* pathrun = tempBase + strlen(tempBase); + char* pathrun = tempBase + mir_strlen(tempBase); while ((*pathrun != '\\' && *pathrun != '/') && (pathrun > tempBase)) pathrun--; pathrun++; *pathrun = '\0'; @@ -393,7 +393,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, if (event->hContact != NULL) { if (!db_get(event->hContact, "CList", "StatusMsg", &dbv)) { - if (strlen(dbv.pszVal) > 0) + if (mir_strlen(dbv.pszVal) > 0) szStatusMsg = mir_utf8encode(dbv.pszVal); db_free(&dbv); } diff --git a/plugins/IEView/src/TextToken.cpp b/plugins/IEView/src/TextToken.cpp index 14c8b2500b..e44dc5e35b 100644 --- a/plugins/IEView/src/TextToken.cpp +++ b/plugins/IEView/src/TextToken.cpp @@ -309,7 +309,7 @@ TextToken* TextToken::tokenizeSmileys(MCONTACT hContact, const char *proto, cons int last_pos = 0; if (spRes != NULL) { for (int i = 0; i < (int)sp.numSmileys; i++) { - if (spRes[i].filepath != NULL && strlen((char *)spRes[i].filepath) > 0) { + if (spRes[i].filepath != NULL && mir_strlen((char *)spRes[i].filepath) > 0) { if ((int)spRes[i].startChar - last_pos > 0) { TextToken *newToken = new TextToken(TEXT, text + last_pos, spRes[i].startChar - last_pos); if (lastToken == NULL) diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp index 76a3488d90..77def5af4b 100644 --- a/plugins/IEView/src/Utils.cpp +++ b/plugins/IEView/src/Utils.cpp @@ -92,7 +92,7 @@ char *Utils::escapeString(const char *a) if (a == NULL) return NULL; - int i, l, len = (int)strlen(a); + int i, l, len = (int)mir_strlen(a); for (i = l = 0; i < len; i++, l++) { if (a[i] == '\\' || a[i] == '\n' || a[i] == '\r' || a[i] == '\"' || a[i] == '\'' || a[i] == '\b' || a[i] == '\t' || a[i] == '\f') { -- cgit v1.2.3