From f2de79cb2eb8247548650ee80d75be109ac66ee7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 16:25:49 +0000 Subject: replace strcat to mir_strcat git-svn-id: http://svn.miranda-ng.org/main/trunk@13777 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/mmi.cpp | 4 ++-- plugins/SecureIM/src/options.cpp | 2 +- plugins/SecureIM/src/splitmsg.cpp | 2 +- plugins/SecureIM/src/svcs_proto.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/SecureIM') diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 6e99874fd1..5f2c5a8896 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -52,7 +52,7 @@ char* m_aastrcat(LPCSTR strA, LPCSTR strB) int lenB = (int)mir_strlen(strB); LPSTR str = (LPSTR)mir_alloc((lenA + lenB + 1)*(sizeof(WCHAR) + 1)); mir_strcpy(str, strA); - strcat(str, strB); + mir_strcat(str, strB); MultiByteToWideChar(CP_ACP, 0, str, -1, (LPWSTR)(str + lenA + lenB + 1), (lenA + lenB + 1)*sizeof(WCHAR)); return str; } @@ -64,7 +64,7 @@ char* m_ustrcat(LPCSTR strA, LPCSTR strB) { SAFE_FREE(m_string); m_string = (LPSTR)mir_alloc(mir_strlen(strA) + mir_strlen(strB) + 1); - mir_strcpy(m_string, strA); strcat(m_string, strB); + mir_strcpy(m_string, strA); mir_strcat(m_string, strB); return m_string; } diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index afd32ada42..157ac96f8d 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1299,7 +1299,7 @@ void ApplyProtoSettings(HWND hDlg) p->inspecting = ListView_GetCheckState(hLV, i); char tmp[128]; mir_snprintf(tmp, SIZEOF(tmp), "%s:%d:%d:%d;", p->name, p->inspecting, p->tsplit_on, p->tsplit_off); - strcat(szNames, tmp); + mir_strcat(szNames, tmp); p->split_on = p->tsplit_on; p->split_off = p->tsplit_off; i = ListView_GetNextItem(hLV, i, LVNI_ALL); diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp index 4fef281087..c502c5c16f 100644 --- a/plugins/SecureIM/src/splitmsg.cpp +++ b/plugins/SecureIM/src/splitmsg.cpp @@ -72,7 +72,7 @@ LPSTR combineMessage(pUinKey ptr, LPSTR szMsg) SAFE_FREE(ptr->tmp); ptr->tmp = (LPSTR)mir_alloc(len + 1); *(ptr->tmp) = '\0'; for (i = 0; i < part_all; i++) { - strcat(ptr->tmp, pm->message[i]); + mir_strcat(ptr->tmp, pm->message[i]); delete pm->message[i]; } delete pm->message; diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index 9b2a3cb669..e254f7b81e 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -112,7 +112,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) LPSTR tmp = (LPSTR)mir_alloc(mir_strlen(ptr->msgSplitted) + mir_strlen(szEncMsg) + 1); mir_strcpy(tmp, ptr->msgSplitted); - strcat(tmp, szEncMsg); + mir_strcat(tmp, szEncMsg); mir_free(ptr->msgSplitted); ptr->msgSplitted = szEncMsg = ppre->szMessage = tmp; ssig = getSecureSig(tmp, &szEncMsg); @@ -226,7 +226,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ptrA reSend((LPSTR)mir_alloc(mir_strlen(szEncMsg) + LEN_RSND)); mir_strcpy(reSend, SIG_RSND); // copy resend sig - strcat(reSend, szEncMsg); // add mess + mir_strcat(reSend, szEncMsg); // add mess pccsd->wParam |= PREF_METANODB; pccsd->lParam = (LPARAM)reSend; // reSend Message to reemit -- cgit v1.2.3