diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 16:43:34 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 16:43:34 +0000 |
| commit | 11c185ebb3013230538d4a48656b23bf81d31055 (patch) | |
| tree | 41f64fdbd3785621cfeb89a2c0d07ea1b2c4427f /plugins/New_GPG | |
| parent | f2de79cb2eb8247548650ee80d75be109ac66ee7 (diff) | |
replace _tcscat to mir_tstrcat
git-svn-id: http://svn.miranda-ng.org/main/trunk@13778 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/New_GPG')
| -rwxr-xr-x | plugins/New_GPG/src/main.cpp | 4 | ||||
| -rwxr-xr-x | plugins/New_GPG/src/messages.cpp | 8 | ||||
| -rwxr-xr-x | plugins/New_GPG/src/utilities.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index 7cd8671bd8..28750225be 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -864,9 +864,9 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, mir_realloc(path, (mir_tstrlen(path)+128)*sizeof(TCHAR)); TCHAR *gpg_path = (TCHAR*)mir_alloc(sizeof(TCHAR) * MAX_PATH), *gpg_lang_path = (TCHAR*)mir_alloc(sizeof(TCHAR) * MAX_PATH); mir_tstrcpy(gpg_path, tmp); - _tcscat(gpg_path, _T("\\GnuPG\\gpg.exe")); + mir_tstrcat(gpg_path, _T("\\GnuPG\\gpg.exe")); mir_tstrcpy(gpg_lang_path, tmp); - _tcscat(gpg_lang_path, _T("\\GnuPG\\gnupg.nls\\en@quot.mo")); + mir_tstrcat(gpg_lang_path, _T("\\GnuPG\\gnupg.nls\\en@quot.mo")); mir_free(tmp); if(boost::filesystem::exists(gpg_path)) { diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp index cc24f0f57a..3c6f993507 100755 --- a/plugins/New_GPG/src/messages.cpp +++ b/plugins/New_GPG/src/messages.cpp @@ -384,12 +384,12 @@ INT_PTR RecvMsgSvc(WPARAM w, LPARAM l) ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); mir_tstrcpy(tmp2, ptmp); mir_free(ptmp); - _tcscat(tmp2, _T("\\")); + mir_tstrcat(tmp2, _T("\\")); TCHAR *tmp3 = mir_a2t(get_random(5).c_str()); - _tcscat(tmp2, tmp3); - _tcscat(tmp2, _T(".asc")); + mir_tstrcat(tmp2, tmp3); + mir_tstrcat(tmp2, _T(".asc")); mir_free(tmp3); - //_tcscat(tmp2, _T("temporary_exported.asc")); + //mir_tstrcat(tmp2, _T("temporary_exported.asc")); boost::filesystem::remove(tmp2); wfstream f(tmp2, std::ios::out); while(!f.is_open()) diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index ab75f3c284..d89a78cb8f 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -1136,7 +1136,7 @@ bool isGPGValid() //mir_realloc(path, (mir_tstrlen(path)+64)*sizeof(TCHAR)); TCHAR *gpg_path = (TCHAR*)mir_alloc(sizeof(TCHAR)*MAX_PATH); mir_tstrcpy(gpg_path, tmp); - _tcscat(gpg_path, _T("\\GnuPG\\gpg.exe")); + mir_tstrcat(gpg_path, _T("\\GnuPG\\gpg.exe")); mir_free(tmp); tmp = NULL; p = boost::filesystem::path(gpg_path); |