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/YahooGroups/src/services.cpp | 8 ++++---- plugins/YahooGroups/src/utils.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/YahooGroups') diff --git a/plugins/YahooGroups/src/services.cpp b/plugins/YahooGroups/src/services.cpp index 863a4648e9..75b4e8f75f 100644 --- a/plugins/YahooGroups/src/services.cpp +++ b/plugins/YahooGroups/src/services.cpp @@ -55,7 +55,7 @@ void ReadAvailableGroups() { mir_snprintf(tmp, SIZEOF(tmp), "%d", index); GetStringFromDatabase(NULL, CLIST_GROUPS, tmp, NULL, group, sizeof(group)); - if (strlen(group) > 0) + if (mir_strlen(group) > 0) { availableGroups.Add(_strdup(group + 1)); index += 1; @@ -124,7 +124,7 @@ void CreateGroup(char *group) while ((p = strchr(sub, '\\'))) { *p = 0; - if (strlen(buffer) > 0) + if (mir_strlen(buffer) > 0) { strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer)); strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer)); @@ -144,7 +144,7 @@ void CreateGroup(char *group) if (sub) { - if (strlen(buffer) > 0) + if (mir_strlen(buffer) > 0) { strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer)); strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer)); @@ -171,7 +171,7 @@ void YahooMoveCallback(MCONTACT hContact, char *unused) char protocol[128] = {0}; GetContactProtocol(hContact, protocol, sizeof(protocol)); - if (strlen(protocol) > 0) + if (mir_strlen(protocol) > 0) { char ygroup[128] = {0}; diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp index 7c7fede24f..a2306b69b2 100644 --- a/plugins/YahooGroups/src/utils.cpp +++ b/plugins/YahooGroups/src/utils.cpp @@ -55,7 +55,7 @@ int Log(char *format, ...) } va_end(vararg); - if (str[strlen(str) - 1] != '\n') + if (str[mir_strlen(str) - 1] != '\n') { strcat(str, "\n"); } @@ -141,7 +141,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName if (db_get_s(hContact, szModule, szSettingName, &dbv) == 0) { res = 0; - int tmp = (int)strlen(dbv.pszVal); + int tmp = (int)mir_strlen(dbv.pszVal); len = (tmp < size - 1) ? tmp : size - 1; strncpy(szResult, dbv.pszVal, len); szResult[len] = '\0'; @@ -151,7 +151,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName res = 1; if (szError) { - int tmp = (int)strlen(szError); + int tmp = (int)mir_strlen(szError); len = (tmp < size - 1) ? tmp : size - 1; strncpy(szResult, szError, len); szResult[len] = '\0'; -- cgit v1.2.3