From babf7873a3fe373d60ef22b1b671d98e014d8819 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 19:52:29 +0000 Subject: replace strcpy to mir_strcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeClassic/src/skype.cpp | 10 +++++----- protocols/SkypeClassic/src/skypeapi.cpp | 8 ++++---- protocols/SkypeClassic/src/skypeopt.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'protocols/SkypeClassic/src') diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp index 4204b25ece..147b467ecc 100644 --- a/protocols/SkypeClassic/src/skype.cpp +++ b/protocols/SkypeClassic/src/skype.cpp @@ -2179,8 +2179,8 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam) } if (!strncmp(szSkypeMsg, "PROTOCOL ", 9)) { if ((protocol = (char)atoi(szSkypeMsg + 9)) >= 3) { - strcpy(cmdMessage, "CHATMESSAGE"); - strcpy(cmdPartner, "FROM"); + mir_strcpy(cmdMessage, "CHATMESSAGE"); + mir_strcpy(cmdPartner, "FROM"); } bProtocolSet = TRUE; @@ -2434,7 +2434,7 @@ void RetrieveUserAvatar(void *param) { // Get filename FoldersGetCustomPath(hProtocolAvatarsFolder, AvatarFile, sizeof(AvatarFile), DefaultAvatarsFolder); - if (!*AvatarFile) strcpy(AvatarFile, DefaultAvatarsFolder); + if (!*AvatarFile) mir_strcpy(AvatarFile, DefaultAvatarsFolder); mir_snprintf(AvatarTmpFile, SIZEOF(AvatarTmpFile), "AVATAR 1 %s\\%s_tmp.jpg", AvatarFile, dbv.pszVal); pszTempFile = AvatarTmpFile + 9; mir_snprintf(AvatarFile, SIZEOF(AvatarFile), "%s\\%s.jpg", AvatarFile, dbv.pszVal); @@ -2544,7 +2544,7 @@ INT_PTR SkypeGetAvatarInfo(WPARAM wParam, LPARAM lParam) // Return the avatar AI->format = PA_FORMAT_JPEG; - strcpy(AI->filename, AvatarFile); + mir_strcpy(AI->filename, AvatarFile); return GAIR_SUCCESS; } } @@ -2726,7 +2726,7 @@ INT_PTR SkypeSendMessage(WPARAM, LPARAM lParam) { if (psendarg) { psendarg->hContact = ccs->hContact; - strcpy(psendarg->szId, szId); + mir_strcpy(psendarg->szId, szId); pthread_create(MessageSendWatchThread, psendarg); } else diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp index 5c464bae39..5d867494c0 100644 --- a/protocols/SkypeClassic/src/skypeapi.cpp +++ b/protocols/SkypeClassic/src/skypeapi.cpp @@ -709,7 +709,7 @@ INT_PTR SkypeCall(WPARAM wParam, LPARAM lParam) { } else { if (db_get_s(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1; msg=(char *)malloc(mir_strlen(dbv.pszVal)+6); - strcpy(msg, "CALL "); + mir_strcpy(msg, "CALL "); strcat(msg, dbv.pszVal); res=SkypeSend(msg); } @@ -747,7 +747,7 @@ INT_PTR SkypeCallHangup(WPARAM wParam, LPARAM lParam) //} else { // if (db_get(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1; // msg=(char *)malloc(mir_strlen(dbv.pszVal)+6); - // strcpy(msg, "CALL "); + // mir_strcpy(msg, "CALL "); // strcat(msg, dbv.pszVal); // res=SkypeSend(msg); return res; @@ -864,7 +864,7 @@ static INT_PTR CALLBACK DialDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR } if (!db_set_s(hContact, SKYPE_PROTONAME, "SkypeOutNr", number)) { msg=(char *)malloc(mir_strlen(number)+6); - strcpy(msg, "CALL "); + mir_strcpy(msg, "CALL "); strcat(msg, number); if (SkypeSend(msg) || (ptr=SkypeRcv("ERROR", 500))) { db_unset(hContact, SKYPE_PROTONAME, "SkypeOutNr"); @@ -1165,7 +1165,7 @@ INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam) { return -2; FoldersGetCustomPath(hProtocolAvatarsFolder, AvatarFile, sizeof(AvatarFile), DefaultAvatarsFolder); - if (!*AvatarFile) strcpy (AvatarFile, DefaultAvatarsFolder); + if (!*AvatarFile) mir_strcpy (AvatarFile, DefaultAvatarsFolder); mir_snprintf(AvatarFile, SIZEOF(AvatarFile), "%s\\%s avatar.%s", AvatarFile, SKYPE_PROTONAME, ext); // Backup old file diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp index 9cd32df960..d46f6a2b87 100644 --- a/protocols/SkypeClassic/src/skypeopt.cpp +++ b/protocols/SkypeClassic/src/skypeopt.cpp @@ -675,13 +675,13 @@ INT_PTR CALLBACK OptionsDefaultDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L GetDlgItemTextA(hwndDlg,IDC_COMMANDLINE,szFileName,SIZEOF(szFileName)); TranslateMirandaRelativePathToAbsolute(szFileName, szAbsolutePath, FALSE); - strcpy (szFileName, szAbsolutePath); + mir_strcpy (szFileName, szAbsolutePath); BOOL gofnResult = GetOpenFileNameA(&ofn); if (!gofnResult && CommDlgExtendedError() == FNERR_INVALIDFILENAME){ - strcpy(szFileName, ".\\Skype.exe"); + mir_strcpy(szFileName, ".\\Skype.exe"); TranslateMirandaRelativePathToAbsolute(szFileName, szAbsolutePath, FALSE); - strcpy (szFileName, szAbsolutePath); + mir_strcpy (szFileName, szAbsolutePath); gofnResult = GetOpenFileNameA(&ofn); } -- cgit v1.2.3