From 6fcfba2c46a456677b5825a899469ba4e8905448 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 17:49:58 +0000 Subject: replace strncpy to mir_strncpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13785 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/miranda.cpp | 2 +- src/core/stdchat/src/main.cpp | 12 ++++++------ src/core/stdclist/src/clcfonts.cpp | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/core') diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index b5b65f8d40..510b6b2abf 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -363,7 +363,7 @@ static INT_PTR GetMirandaVersionText(WPARAM wParam, LPARAM lParam) UINT blockSize; VerQueryValue(pVerInfo, _T("\\StringFileInfo\\000004b0\\ProductVersion"), (LPVOID*)&productVersion, &blockSize); - strncpy((char*)lParam, _T2A(productVersion), wParam); + mir_strncpy((char*)lParam, _T2A(productVersion), wParam); #if defined(_WIN64) strcat_s((char*)lParam, wParam, " x64"); #endif diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp index 48b31036a2..28390d4b66 100644 --- a/src/core/stdchat/src/main.cpp +++ b/src/core/stdchat/src/main.cpp @@ -286,30 +286,30 @@ static void OnLoadSettings() static void RegisterFonts() { ColourIDT colourid = { sizeof(colourid) }; - strncpy(colourid.dbSettingsGroup, CHAT_MODULE, sizeof(colourid.dbSettingsGroup)); + mir_strncpy(colourid.dbSettingsGroup, CHAT_MODULE, sizeof(colourid.dbSettingsGroup)); _tcsncpy(colourid.group, LPGENT("Chat module"), SIZEOF(colourid.group)); - strncpy(colourid.setting, "ColorLogBG", SIZEOF(colourid.setting)); + mir_strncpy(colourid.setting, "ColorLogBG", SIZEOF(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Group chat log background"), SIZEOF(colourid.name)); colourid.defcolour = GetSysColor(COLOR_WINDOW); ColourRegisterT(&colourid); - strncpy(colourid.setting, "ColorMessageBG", SIZEOF(colourid.setting)); + mir_strncpy(colourid.setting, "ColorMessageBG", SIZEOF(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Message background"), SIZEOF(colourid.name)); colourid.defcolour = GetSysColor(COLOR_WINDOW); ColourRegisterT(&colourid); - strncpy(colourid.setting, "ColorNicklistBG", SIZEOF(colourid.setting)); + mir_strncpy(colourid.setting, "ColorNicklistBG", SIZEOF(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Nick list background"), SIZEOF(colourid.name)); colourid.defcolour = GetSysColor(COLOR_WINDOW); ColourRegisterT(&colourid); - strncpy(colourid.setting, "ColorNicklistLines", SIZEOF(colourid.setting)); + mir_strncpy(colourid.setting, "ColorNicklistLines", SIZEOF(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Nick list lines"), SIZEOF(colourid.name)); colourid.defcolour = GetSysColor(COLOR_INACTIVEBORDER); ColourRegisterT(&colourid); - strncpy(colourid.setting, "ColorNicklistSelectedBG", SIZEOF(colourid.setting)); + mir_strncpy(colourid.setting, "ColorNicklistSelectedBG", SIZEOF(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Nick list background (selected)"), SIZEOF(colourid.name)); colourid.defcolour = GetSysColor(COLOR_HIGHLIGHT); ColourRegisterT(&colourid); diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp index 02ae7b298e..07e823d998 100644 --- a/src/core/stdclist/src/clcfonts.cpp +++ b/src/core/stdclist/src/clcfonts.cpp @@ -53,7 +53,7 @@ void RegisterCListFonts() { FontIDT fontid = { sizeof(fontid) }; fontid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWREREGISTER | FIDF_APPENDNAME | FIDF_NOAS | FIDF_SAVEPOINTSIZE | FIDF_ALLOWEFFECTS; - strncpy(fontid.dbSettingsGroup, "CLC", sizeof(fontid.dbSettingsGroup)); + mir_strncpy(fontid.dbSettingsGroup, "CLC", sizeof(fontid.dbSettingsGroup)); _tcsncpy(fontid.group, LPGENT("Contact list"), SIZEOF(fontid.group)); HDC hdc = GetDC(NULL); @@ -74,7 +74,7 @@ void RegisterCListFonts() char idstr[10]; mir_snprintf(idstr, SIZEOF(idstr), "Font%d", i); - strncpy(fontid.prefix, idstr, SIZEOF(fontid.prefix)); + mir_strncpy(fontid.prefix, idstr, SIZEOF(fontid.prefix)); fontid.order = i; FontRegisterT(&fontid); } @@ -84,27 +84,27 @@ void RegisterCListFonts() ColourIDT colourid = { 0 }; colourid.cbSize = sizeof(ColourIDT); colourid.order = 0; - strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup)); + mir_strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup)); - strncpy(colourid.setting, "BkColour", sizeof(colourid.setting)); + mir_strncpy(colourid.setting, "BkColour", sizeof(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Background"), SIZEOF(colourid.name)); _tcsncpy(colourid.group, LPGENT("Contact list"), SIZEOF(colourid.group)); colourid.defcolour = CLCDEFAULT_BKCOLOUR; ColourRegisterT(&colourid); - strncpy(colourid.setting, "SelTextColour", sizeof(colourid.setting)); + mir_strncpy(colourid.setting, "SelTextColour", sizeof(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Selected text"), SIZEOF(colourid.name)); colourid.order = 1; colourid.defcolour = CLCDEFAULT_SELTEXTCOLOUR; ColourRegisterT(&colourid); - strncpy(colourid.setting, "HotTextColour", sizeof(colourid.setting)); + mir_strncpy(colourid.setting, "HotTextColour", sizeof(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Hottrack text"), SIZEOF(colourid.name)); colourid.order = 1; colourid.defcolour = CLCDEFAULT_HOTTEXTCOLOUR; ColourRegisterT(&colourid); - strncpy(colourid.setting, "QuickSearchColour", sizeof(colourid.setting)); + mir_strncpy(colourid.setting, "QuickSearchColour", sizeof(colourid.setting)); _tcsncpy(colourid.name, LPGENT("Quicksearch text"), SIZEOF(colourid.name)); colourid.order = 1; colourid.defcolour = CLCDEFAULT_QUICKSEARCHCOLOUR; -- cgit v1.2.3