diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 20:07:58 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 20:07:58 +0000 |
commit | c09aa99a7e9915c503064d6eb5e9dd1bdd2a673f (patch) | |
tree | 9b1b1447755b03dc6fcb327b027789b415e3119f /plugins/Variables | |
parent | babf7873a3fe373d60ef22b1b671d98e014d8819 (diff) |
replace _tcscpy to mir_tstrcpy
git-svn-id: http://svn.miranda-ng.org/main/trunk@13764 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Variables')
-rw-r--r-- | plugins/Variables/src/parse_external.cpp | 4 | ||||
-rw-r--r-- | plugins/Variables/src/parse_math.cpp | 2 | ||||
-rw-r--r-- | plugins/Variables/src/parse_str.cpp | 8 | ||||
-rw-r--r-- | plugins/Variables/src/parse_system.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Variables/src/parse_external.cpp b/plugins/Variables/src/parse_external.cpp index 4aec50a9ee..c3c857c46d 100644 --- a/plugins/Variables/src/parse_external.cpp +++ b/plugins/Variables/src/parse_external.cpp @@ -42,8 +42,8 @@ static TCHAR *getFullWinampTitleText() mir_free(szWinText);
return NULL;
}
- _tcscpy(szTitle, szWinText);
- _tcscpy(szTitle + mir_tstrlen(szTitle), szWinText);
+ mir_tstrcpy(szTitle, szWinText);
+ mir_tstrcpy(szTitle + mir_tstrlen(szTitle), szWinText);
mir_free(szWinText);
return szTitle;
diff --git a/plugins/Variables/src/parse_math.cpp b/plugins/Variables/src/parse_math.cpp index 2581828c28..883216bc49 100644 --- a/plugins/Variables/src/parse_math.cpp +++ b/plugins/Variables/src/parse_math.cpp @@ -61,7 +61,7 @@ static TCHAR *parseHex(ARGUMENTSINFO *ai) return NULL;
memset(res, 0, ((zeros + mir_tstrlen(szVal) + 3) * sizeof(TCHAR)));
- _tcscpy(res, _T("0x"));
+ mir_tstrcpy(res, _T("0x"));
for (i = 0; i < zeros; i++)
*(res + 2 + i) = '0';
diff --git a/plugins/Variables/src/parse_str.cpp b/plugins/Variables/src/parse_str.cpp index d7e797c830..949051cdda 100644 --- a/plugins/Variables/src/parse_str.cpp +++ b/plugins/Variables/src/parse_str.cpp @@ -170,8 +170,8 @@ static TCHAR *parseInsert(ARGUMENTSINFO *ai) memset(res, 0, ((mir_tstrlen(ai->targv[1]) + mir_tstrlen(ai->targv[2]) + 1) * sizeof(TCHAR)));
_tcsncpy(res, ai->targv[1], pos);
- _tcscpy(res + pos, ai->targv[2]);
- _tcscpy(res + pos + mir_tstrlen(ai->targv[2]), ai->targv[1] + pos);
+ mir_tstrcpy(res + pos, ai->targv[2]);
+ mir_tstrcpy(res + pos + mir_tstrlen(ai->targv[2]), ai->targv[1] + pos);
return res;
}
@@ -302,7 +302,7 @@ static TCHAR *parsePadright(ARGUMENTSINFO *ai) return NULL;
memset(res, 0, ((addcount + mir_tstrlen(ai->targv[1]) + 1) * sizeof(TCHAR)));
- _tcscpy(res, ai->targv[1]);
+ mir_tstrcpy(res, ai->targv[1]);
TCHAR *cur = res + mir_tstrlen(ai->targv[1]);
for (unsigned int i = 0; i < addcount; i++)
*cur++ = padchar;
@@ -459,7 +459,7 @@ static TCHAR *parseScroll(ARGUMENTSINFO *ai) return NULL;
memset(res, 0, ((2 * mir_tstrlen(ai->targv[1]) + 1) * sizeof(TCHAR)));
- _tcscpy(res, ai->targv[1]);
+ mir_tstrcpy(res, ai->targv[1]);
_tcscat(res, ai->targv[1]);
memmove(res, res + move, (mir_tstrlen(res + move) + 1)*sizeof(TCHAR));
*(res + display) = 0;
diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp index 1298f73464..5446a8e2f0 100644 --- a/plugins/Variables/src/parse_system.cpp +++ b/plugins/Variables/src/parse_system.cpp @@ -400,7 +400,7 @@ static TCHAR *parseListDir(ARGUMENTSINFO *ai) }
if (((ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) && (bDirs)) || ((!(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) && (bFiles))) {
tszRes = (TCHAR*)mir_alloc((mir_tstrlen(ffd.cFileName) + mir_tstrlen(tszSeperator) + 1)*sizeof(TCHAR));
- _tcscpy(tszRes, ffd.cFileName);
+ mir_tstrcpy(tszRes, ffd.cFileName);
}
while (FindNextFile(hFind, &ffd) != 0) {
if (((ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) && (bDirs)) || ((!(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) && (bFiles))) {
@@ -410,7 +410,7 @@ static TCHAR *parseListDir(ARGUMENTSINFO *ai) }
else {
tszRes = (TCHAR*)mir_alloc((mir_tstrlen(ffd.cFileName) + mir_tstrlen(tszSeperator) + 1)*sizeof(TCHAR));
- _tcscpy(tszRes, _T(""));
+ mir_tstrcpy(tszRes, _T(""));
}
_tcscat(tszRes, ffd.cFileName);
}
@@ -861,7 +861,7 @@ static TCHAR *parseClipboard(ARGUMENTSINFO *ai) TCHAR *tszText = (TCHAR*)GlobalLock(hData);
size_t len = mir_tstrlen(tszText);
res = (TCHAR*)mir_alloc((len + 1) * sizeof(TCHAR));
- _tcscpy(res, tszText);
+ mir_tstrcpy(res, tszText);
res[len] = 0;
GlobalUnlock(hData);
}
|