diff options
Diffstat (limited to 'plugins/Variables/src')
| -rw-r--r-- | plugins/Variables/src/parse_alias.cpp | 4 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_logic.cpp | 2 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_math.cpp | 4 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_str.cpp | 12 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_system.cpp | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/plugins/Variables/src/parse_alias.cpp b/plugins/Variables/src/parse_alias.cpp index 057ac88d5a..d08a05a2ec 100644 --- a/plugins/Variables/src/parse_alias.cpp +++ b/plugins/Variables/src/parse_alias.cpp @@ -160,9 +160,9 @@ static TCHAR *parseAddAlias(ARGUMENTSINFO *ai) else
szArgs = (TCHAR*)mir_realloc(szArgs, (mir_tstrlen(szArgs) + mir_tstrlen(argv[i]) + 2)*sizeof(TCHAR));
- _tcscat(szArgs, argv[i]);
+ mir_tstrcat(szArgs, argv[i]);
if (i != argc - 1)
- _tcscat(szArgs, _T(","));
+ mir_tstrcat(szArgs, _T(","));
}
int res;
if (szArgs != NULL && argc > 0) {
diff --git a/plugins/Variables/src/parse_logic.cpp b/plugins/Variables/src/parse_logic.cpp index ec1c70e2a3..c7189406f5 100644 --- a/plugins/Variables/src/parse_logic.cpp +++ b/plugins/Variables/src/parse_logic.cpp @@ -188,7 +188,7 @@ static TCHAR *parseFor(ARGUMENTSINFO *ai) }
else res = (TCHAR*)mir_realloc(res, (mir_tstrlen(res) + mir_tstrlen(parsed) + 1)*sizeof(TCHAR));
- _tcscat(res, parsed);
+ mir_tstrcat(res, parsed);
mir_free(parsed);
}
fi.tszFormat = ai->targv[3];
diff --git a/plugins/Variables/src/parse_math.cpp b/plugins/Variables/src/parse_math.cpp index 883216bc49..4dc0913824 100644 --- a/plugins/Variables/src/parse_math.cpp +++ b/plugins/Variables/src/parse_math.cpp @@ -65,7 +65,7 @@ static TCHAR *parseHex(ARGUMENTSINFO *ai) for (i = 0; i < zeros; i++)
*(res + 2 + i) = '0';
- _tcscat(res, szVal);
+ mir_tstrcat(res, szVal);
return res;
}
@@ -152,7 +152,7 @@ static TCHAR *parseNum(ARGUMENTSINFO *ai) for (unsigned i = 0; i < zeros; i++)
*cur++ = '0';
- _tcscat(res, szVal);
+ mir_tstrcat(res, szVal);
mir_free(szVal);
return res;
diff --git a/plugins/Variables/src/parse_str.cpp b/plugins/Variables/src/parse_str.cpp index 949051cdda..a8903e89f0 100644 --- a/plugins/Variables/src/parse_str.cpp +++ b/plugins/Variables/src/parse_str.cpp @@ -119,7 +119,7 @@ static TCHAR *parseFixeol(ARGUMENTSINFO *ai) memset(res, 0, (((cur - ai->targv[1]) + 1) * sizeof(TCHAR)));
_tcsncpy(res, ai->targv[1], cur - ai->targv[1]);
- _tcscat(res, szReplacement);
+ mir_tstrcat(res, szReplacement);
return res;
}
@@ -279,7 +279,7 @@ static TCHAR *parsePad(ARGUMENTSINFO *ai) for (unsigned int i = 0; i < addcount; i++)
*cur++ = padchar;
- _tcscat(res, ai->targv[1]);
+ mir_tstrcat(res, ai->targv[1]);
return res;
}
@@ -383,7 +383,7 @@ static TCHAR *parseRepeat(ARGUMENTSINFO *ai) memset(res, 0, ((count * mir_tstrlen(ai->targv[1]) + 1) * sizeof(TCHAR)));
for (int i = 0; i < count; i++)
- _tcscat(res, ai->targv[1]);
+ mir_tstrcat(res, ai->targv[1]);
return res;
}
@@ -460,7 +460,7 @@ static TCHAR *parseScroll(ARGUMENTSINFO *ai) memset(res, 0, ((2 * mir_tstrlen(ai->targv[1]) + 1) * sizeof(TCHAR)));
mir_tstrcpy(res, ai->targv[1]);
- _tcscat(res, ai->targv[1]);
+ mir_tstrcat(res, ai->targv[1]);
memmove(res, res + move, (mir_tstrlen(res + move) + 1)*sizeof(TCHAR));
*(res + display) = 0;
res = (TCHAR*)mir_realloc(res, (mir_tstrlen(res) + 1)*sizeof(TCHAR));
@@ -754,8 +754,8 @@ static TCHAR *parseWord(ARGUMENTSINFO *ai) TCHAR *pres = (TCHAR*)mir_realloc(res, (mir_tstrlen(res) + mir_tstrlen(szWord) + 2)*sizeof(TCHAR));
if (pres != NULL) {
res = pres;
- _tcscat(res, _T(" "));
- _tcscat(res, szWord);
+ mir_tstrcat(res, _T(" "));
+ mir_tstrcat(res, szWord);
}
mir_free(szWord);
}
diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp index 5446a8e2f0..801de2637b 100644 --- a/plugins/Variables/src/parse_system.cpp +++ b/plugins/Variables/src/parse_system.cpp @@ -405,14 +405,14 @@ static TCHAR *parseListDir(ARGUMENTSINFO *ai) while (FindNextFile(hFind, &ffd) != 0) {
if (((ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) && (bDirs)) || ((!(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) && (bFiles))) {
if (tszRes != NULL) {
- _tcscat(tszRes, tszSeperator);
+ mir_tstrcat(tszRes, tszSeperator);
tszRes = (TCHAR*)mir_realloc(tszRes, (mir_tstrlen(tszRes) + mir_tstrlen(ffd.cFileName) + mir_tstrlen(tszSeperator) + 1)*sizeof(TCHAR));
}
else {
tszRes = (TCHAR*)mir_alloc((mir_tstrlen(ffd.cFileName) + mir_tstrlen(tszSeperator) + 1)*sizeof(TCHAR));
mir_tstrcpy(tszRes, _T(""));
}
- _tcscat(tszRes, ffd.cFileName);
+ mir_tstrcat(tszRes, ffd.cFileName);
}
}
FindClose(hFind);
|