diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 16:25:49 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 16:25:49 +0000 |
commit | f2de79cb2eb8247548650ee80d75be109ac66ee7 (patch) | |
tree | 5f6ae43436ad92857bc3361556e581dea0a28270 /protocols/SkypeClassic | |
parent | 83810fbdf96dc0a842bf149cfa40749e95b0fe63 (diff) |
replace strcat to mir_strcat
git-svn-id: http://svn.miranda-ng.org/main/trunk@13777 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeClassic')
-rw-r--r-- | protocols/SkypeClassic/src/filexfer.cpp | 8 | ||||
-rw-r--r-- | protocols/SkypeClassic/src/skypeapi.cpp | 14 | ||||
-rw-r--r-- | protocols/SkypeClassic/src/skypeopt.cpp | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/protocols/SkypeClassic/src/filexfer.cpp b/protocols/SkypeClassic/src/filexfer.cpp index f24e7273a7..313af9a315 100644 --- a/protocols/SkypeClassic/src/filexfer.cpp +++ b/protocols/SkypeClassic/src/filexfer.cpp @@ -78,10 +78,10 @@ INT_PTR SkypeSendFile(WPARAM, LPARAM lParam) utfmsg = (char*)make_utf8_string(files[nFiles]);
iLen += mir_strlen(utfmsg) + 3;
if (pszFile = pszFile ? (char*)realloc(pszFile, iLen) : (char*)calloc(1, iLen)) {
- if (nFiles > 0) strcat(pszFile, ",");
- strcat(pszFile, "\"");
- strcat(pszFile, utfmsg);
- strcat(pszFile, "\"");
+ if (nFiles > 0) mir_strcat(pszFile, ",");
+ mir_strcat(pszFile, "\"");
+ mir_strcat(pszFile, utfmsg);
+ mir_strcat(pszFile, "\"");
}
free(utfmsg);
}
diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp index 5d867494c0..ad6bc71967 100644 --- a/protocols/SkypeClassic/src/skypeapi.cpp +++ b/protocols/SkypeClassic/src/skypeapi.cpp @@ -710,7 +710,7 @@ INT_PTR SkypeCall(WPARAM wParam, LPARAM lParam) { if (db_get_s(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1;
msg=(char *)malloc(mir_strlen(dbv.pszVal)+6);
mir_strcpy(msg, "CALL ");
- strcat(msg, dbv.pszVal);
+ mir_strcat(msg, dbv.pszVal);
res=SkypeSend(msg);
}
db_free(&dbv);
@@ -748,7 +748,7 @@ INT_PTR SkypeCallHangup(WPARAM wParam, LPARAM lParam) // if (db_get(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1;
// msg=(char *)malloc(mir_strlen(dbv.pszVal)+6);
// mir_strcpy(msg, "CALL ");
- // strcat(msg, dbv.pszVal);
+ // mir_strcat(msg, dbv.pszVal);
// res=SkypeSend(msg);
return res;
}
@@ -865,7 +865,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);
mir_strcpy(msg, "CALL ");
- strcat(msg, number);
+ mir_strcat(msg, number);
if (SkypeSend(msg) || (ptr=SkypeRcv("ERROR", 500))) {
db_unset(hContact, SKYPE_PROTONAME, "SkypeOutNr");
if (ptr) {
@@ -1173,7 +1173,7 @@ INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam) { {
strncpy(OldAvatarFile, dbv.pszVal, sizeof(OldAvatarFile)-4);
OldAvatarFile[sizeof(OldAvatarFile)-5] = '\0';
- strcat(OldAvatarFile, "_old");
+ mir_strcat(OldAvatarFile, "_old");
DeleteFileA(OldAvatarFile);
if (!MoveFileA(dbv.pszVal, OldAvatarFile))
{
@@ -1440,7 +1440,7 @@ void TranslateMirandaRelativePathToAbsolute(LPCSTR cszPath, LPSTR szAbsolutePath if(fQuoteSpaces && strchr((LPCSTR)szAbsolutePath, ' ')){
memmove (szAbsolutePath+1, szAbsolutePath, mir_strlen(szAbsolutePath)+1);
*szAbsolutePath='"';
- strcat (szAbsolutePath, "\"");
+ mir_strcat (szAbsolutePath, "\"");
}
TRACEA(szAbsolutePath);
@@ -1458,8 +1458,8 @@ static int my_spawnv(const char *cmdname, const char *const *argv, PROCESS_INFOR iLen += (int)mir_strlen(argv[i])+1;
if (!(CommandLine = (char*)calloc(1, iLen))) return -1;
for (i=0; argv[i]; i++) {
- if (i) strcat (CommandLine, " ");
- strcat (CommandLine, argv[i]);
+ if (i) mir_strcat (CommandLine, " ");
+ mir_strcat (CommandLine, argv[i]);
}
si.cb = sizeof(si);
diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp index d46f6a2b87..358a95e153 100644 --- a/protocols/SkypeClassic/src/skypeopt.cpp +++ b/protocols/SkypeClassic/src/skypeopt.cpp @@ -901,7 +901,7 @@ void DoAutoDetect(HWND dlg) return;
}
- strcat(basePath,"\\Skype\\");
+ mir_strcat(basePath,"\\Skype\\");
sprintf (fileName, "%s\\shared.xml", basePath);
if (f1 = ezxml_parse_file(fileName))
|