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/JabberG/src/jabber_iqid.cpp | 2 +- protocols/JabberG/src/jabber_menu.cpp | 32 ++++++++++++++++---------------- protocols/JabberG/src/jabber_misc.cpp | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index e2d765b5d9..1fce21f81a 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -751,7 +751,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) char text[100]; if (hContact != NULL) { if (nEmail == 0) - strcpy(text, "e-mail"); + mir_strcpy(text, "e-mail"); else mir_snprintf(text, SIZEOF(text), "e-mail%d", nEmail - 1); } diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 2c1b351fe6..79335a9182 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -433,7 +433,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) } char text[ 256 ]; - strcpy(text, m_szModuleName); + mir_strcpy(text, m_szModuleName); size_t nModuleNameLength = mir_strlen(text); char* tDest = text + nModuleNameLength; @@ -625,7 +625,7 @@ void CJabberProto::MenuInit() // "Bookmarks..." CreateProtoService("/Bookmarks", &CJabberProto::OnMenuHandleBookmarks); - strcpy(tDest, "/Bookmarks"); + mir_strcpy(tDest, "/Bookmarks"); mi.flags = CMIF_CHILDPOPUP; mi.hParentMenu = hJabberRoot; mi.pszName = LPGEN("Bookmarks"); @@ -635,14 +635,14 @@ void CJabberProto::MenuInit() // "Services..." mi.pszName = LPGEN("Services..."); - strcpy(tDest, "/Services"); + mir_strcpy(tDest, "/Services"); mi.position = 200003; mi.icolibItem = GetIconHandle(IDI_SERVICE_DISCOVERY); HGENMENU hMenuServicesRoot = Menu_AddProtoMenuItem(&mi); // "Service Discovery..." CreateProtoService("/ServiceDiscovery", &CJabberProto::OnMenuHandleServiceDiscovery); - strcpy(tDest, "/ServiceDiscovery"); + mir_strcpy(tDest, "/ServiceDiscovery"); mi.flags = CMIF_ROOTHANDLE; mi.pszName = LPGEN("Service Discovery"); mi.position = 2000050001; @@ -651,28 +651,28 @@ void CJabberProto::MenuInit() m_hMenuServiceDiscovery = Menu_AddProtoMenuItem(&mi); CreateProtoService("/SD/MyTransports", &CJabberProto::OnMenuHandleServiceDiscoveryMyTransports); - strcpy(tDest, "/SD/MyTransports"); + mir_strcpy(tDest, "/SD/MyTransports"); mi.pszName = LPGEN("Registered Transports"); mi.position = 2000050003; mi.icolibItem = GetIconHandle(IDI_TRANSPORTL); m_hMenuSDMyTransports = Menu_AddProtoMenuItem(&mi); CreateProtoService("/SD/Transports", &CJabberProto::OnMenuHandleServiceDiscoveryTransports); - strcpy(tDest, "/SD/Transports"); + mir_strcpy(tDest, "/SD/Transports"); mi.pszName = LPGEN("Local Server Transports"); mi.position = 2000050004; mi.icolibItem = GetIconHandle(IDI_TRANSPORT); m_hMenuSDTransports = Menu_AddProtoMenuItem(&mi); CreateProtoService("/SD/Conferences", &CJabberProto::OnMenuHandleServiceDiscoveryConferences); - strcpy(tDest, "/SD/Conferences"); + mir_strcpy(tDest, "/SD/Conferences"); mi.pszName = LPGEN("Browse chatrooms"); mi.position = 2000050005; mi.icolibItem = GetIconHandle(IDI_GROUP); m_hMenuSDConferences = Menu_AddProtoMenuItem(&mi); CreateProtoService("/Groupchat", &CJabberProto::OnMenuHandleJoinGroupchat); - strcpy(tDest, "/Groupchat"); + mir_strcpy(tDest, "/Groupchat"); mi.pszName = LPGEN("Create/Join group chat"); mi.position = 2000050006; mi.icolibItem = GetIconHandle(IDI_GROUP); @@ -680,7 +680,7 @@ void CJabberProto::MenuInit() // "Change Password..." CreateProtoService("/ChangePassword", &CJabberProto::OnMenuHandleChangePassword); - strcpy(tDest, "/ChangePassword"); + mir_strcpy(tDest, "/ChangePassword"); mi.pszName = LPGEN("Change Password"); mi.position = 2000050007; mi.icolibItem = GetIconHandle(IDI_KEYS); @@ -688,7 +688,7 @@ void CJabberProto::MenuInit() // "Roster editor" CreateProtoService("/RosterEditor", &CJabberProto::OnMenuHandleRosterControl); - strcpy(tDest, "/RosterEditor"); + mir_strcpy(tDest, "/RosterEditor"); mi.pszName = LPGEN("Roster editor"); mi.position = 2000050009; mi.icolibItem = GetIconHandle(IDI_AGENTS); @@ -696,14 +696,14 @@ void CJabberProto::MenuInit() // "XML Console" CreateProtoService("/XMLConsole", &CJabberProto::OnMenuHandleConsole); - strcpy(tDest, "/XMLConsole"); + mir_strcpy(tDest, "/XMLConsole"); mi.pszName = LPGEN("XML Console"); mi.position = 2000050010; mi.icolibItem = GetIconHandle(IDI_CONSOLE); Menu_AddProtoMenuItem(&mi); CreateProtoService("/Notes", &CJabberProto::OnMenuHandleNotes); - strcpy(tDest, "/Notes"); + mir_strcpy(tDest, "/Notes"); mi.pszName = LPGEN("Notes"); mi.position = 2000050011; mi.icolibItem = GetIconHandle(IDI_NOTES); @@ -834,19 +834,19 @@ void CJabberProto::GlobalMenuInit() hkd.ptszSection = m_tszUserName; hkd.dwFlags = HKD_TCHAR; - strcpy(tDest, "/Groupchat"); + mir_strcpy(tDest, "/Groupchat"); hkd.ptszDescription = LPGENT("Join conference"); Hotkey_Register(&hkd); - strcpy(tDest, "/Bookmarks"); + mir_strcpy(tDest, "/Bookmarks"); hkd.ptszDescription = LPGENT("Open bookmarks"); Hotkey_Register(&hkd); - strcpy(tDest, "/PrivacyLists"); + mir_strcpy(tDest, "/PrivacyLists"); hkd.ptszDescription = LPGENT("Privacy lists"); Hotkey_Register(&hkd); - strcpy(tDest, "/ServiceDiscovery"); + mir_strcpy(tDest, "/ServiceDiscovery"); hkd.ptszDescription = LPGENT("Service discovery"); Hotkey_Register(&hkd); } diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp index 672857fe74..844dc54ba7 100644 --- a/protocols/JabberG/src/jabber_misc.cpp +++ b/protocols/JabberG/src/jabber_misc.cpp @@ -87,10 +87,10 @@ void CJabberProto::DBAddAuthRequest(const TCHAR *jid, const TCHAR *nick) PBYTE pCurBlob = dbei.pBlob = (PBYTE)mir_alloc(dbei.cbBlob); *((PDWORD)pCurBlob) = 0; pCurBlob += sizeof(DWORD); *((PDWORD)pCurBlob) = (DWORD)hContact; pCurBlob += sizeof(DWORD); - strcpy((char*)pCurBlob, szNick); pCurBlob += mir_strlen(szNick)+1; + mir_strcpy((char*)pCurBlob, szNick); pCurBlob += mir_strlen(szNick)+1; *pCurBlob = '\0'; pCurBlob++; //firstName *pCurBlob = '\0'; pCurBlob++; //lastName - strcpy((char*)pCurBlob, szJid); pCurBlob += mir_strlen(szJid)+1; + mir_strcpy((char*)pCurBlob, szJid); pCurBlob += mir_strlen(szJid)+1; *pCurBlob = '\0'; //reason db_event_add(NULL, &dbei); -- cgit v1.2.3