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/Sametime/src/files.cpp | 4 ++-- protocols/Sametime/src/options.cpp | 6 +++--- protocols/Sametime/src/sametime_session.cpp | 2 +- protocols/Sametime/src/session_announce_win.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/Sametime/src') diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index f65b6c3b87..e6b0332ebb 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -148,7 +148,7 @@ void mwFileTransfer_closed(mwFileTransfer* ft, guint32 code) if (code != mwFileTransfer_SUCCESS || !mwFileTransfer_isDone(ft)) { if (!ftcd->sending) { char fn[MAX_PATH]; - if (ftcd->save_path) strcpy(fn, ftcd->save_path); + if (ftcd->save_path) mir_strcpy(fn, ftcd->save_path); else fn[0] = 0; strcat(fn, mwFileTransfer_getFileName(ft)); @@ -373,7 +373,7 @@ HANDLE CSametimeProto::AcceptFileTransfer(MCONTACT hContact, HANDLE hFt, char* s if (fn) fn++; if (ftcd->save_path) - strcpy(fp, ftcd->save_path); + mir_strcpy(fp, ftcd->save_path); else fp[0] = 0; diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp index 5d1f077911..f9a2ee775f 100644 --- a/protocols/Sametime/src/options.cpp +++ b/protocols/Sametime/src/options.cpp @@ -294,11 +294,11 @@ static INT_PTR CALLBACK DlgProcOptNet(HWND hwndDlg, UINT msg, WPARAM wParam, LPA TCHAR ws[2048]; GetDlgItemText(hwndDlg, IDC_ED_SNAME, ws, LSTRINGLEN); - strcpy(proto->options.server_name, T2Utf(ws)); + mir_strcpy(proto->options.server_name, T2Utf(ws)); GetDlgItemText(hwndDlg, IDC_ED_NAME, ws, LSTRINGLEN); - strcpy(proto->options.id, T2Utf(ws)); + mir_strcpy(proto->options.id, T2Utf(ws)); GetDlgItemText(hwndDlg, IDC_ED_PWORD, ws, LSTRINGLEN); - strcpy(proto->options.pword, T2Utf(ws)); + mir_strcpy(proto->options.pword, T2Utf(ws)); BOOL translated; int port = GetDlgItemInt(hwndDlg, IDC_ED_PORT, &translated, FALSE); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index c0ee790d85..20fbdef920 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -118,7 +118,7 @@ void __cdecl SessionStateChange(mwSession* session, mwSessionState state, gpoint case mwSession_LOGIN_REDIR: proto->debugLog(_T("SessionStateChange() mwSession_LOGIN_REDIR info=[%s]"), _A2T((char*)info)); //options.server_name = str((char*)info); - strcpy(proto->options.server_name, (char*)info); + mir_strcpy(proto->options.server_name, (char*)info); proto->LogOut(); proto->LogIn(proto->login_status, proto->m_hNetlibUser); break; diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp index 7e36cc65e8..c9fd84f4a9 100644 --- a/protocols/Sametime/src/session_announce_win.cpp +++ b/protocols/Sametime/src/session_announce_win.cpp @@ -87,7 +87,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara LVITEM lvI = { 0 }; char id[1024]; - strcpy(id, "@U"); // documentation says prepend '@U' to usernames and '@G' to notes group names - but + mir_strcpy(id, "@U"); // documentation says prepend '@U' to usernames and '@G' to notes group names - but char *p = id + 2; // it's wrong - it works for a list of user id's with no prefix - so we'll do both // build recipient list @@ -104,7 +104,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara if (!db_get_utf((MCONTACT)lvI.lParam, proto->m_szModuleName, "stid", &dbv)) { safArg->recipients = g_list_prepend(safArg->recipients, _strdup(dbv.pszVal)); - strcpy(p, dbv.pszVal); + mir_strcpy(p, dbv.pszVal); safArg->recipients = g_list_prepend(safArg->recipients, _strdup(id)); send_count++; db_free(&dbv); -- cgit v1.2.3