From d5ee0fc23bdc1a194774591eb4ce63b8bebb8d6e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 17:01:01 +0000 Subject: replace strncat to mir_strncat git-svn-id: http://svn.miranda-ng.org/main/trunk@13780 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Non-IM Contact/src/namereplacing.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/Non-IM Contact/src/namereplacing.cpp') diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp index a1737b6eda..3028cf5f2c 100644 --- a/plugins/Non-IM Contact/src/namereplacing.cpp +++ b/plugins/Non-IM Contact/src/namereplacing.cpp @@ -223,10 +223,10 @@ void checkStringForcompare(char *str) mir_strcat(newStr, X); else mir_strcat(newStr, Y); } - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -249,10 +249,10 @@ void checkStringForSave(MCONTACT hContact, char* str) if (A && B) db_set_s(hContact, MODNAME, A, B); - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -278,10 +278,10 @@ void checkStringForLoad(MCONTACT hContact, char* str) db_free(&dbv); } } - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -323,10 +323,10 @@ void checkStringForSaveN(char* str) break; } } - else strncat(newStr, &str[i], j); + else mir_strncat(newStr, &str[i], j); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -366,10 +366,10 @@ void checkStringForLoadN(char* str) db_free(&dbv); } } - else strncat(newStr, &str[i], i); + else mir_strncat(newStr, &str[i], i); i += j; } - else strncat(newStr, &str[i], 1); + else mir_strncat(newStr, &str[i], 1); } mir_strcpy(str, newStr); free(newStr); @@ -524,7 +524,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) else { // only copying from 1 line if (startLine == endLine) - strncat(newString, &fileContents[startLine][startChar], endChar - startChar); + mir_strncat(newString, &fileContents[startLine][startChar], endChar - startChar); else { int i; // copy the whole first line from startChar @@ -534,7 +534,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) mir_strcat(newString, fileContents[i]); } // copy the last line untill endChar - strncat(newString, fileContents[endLine], endChar); + mir_strncat(newString, fileContents[endLine], endChar); } } } @@ -558,7 +558,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact) positionInOldString += lastChecked(newString, &oldString[positionInOldString]); } else { - strncat(newString, &oldString[positionInOldString], 1); + mir_strncat(newString, &oldString[positionInOldString], 1); positionInOldString++; } } -- cgit v1.2.3