From 4c814798c7bc7f6a0f92c21b027b26290622aa2f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jun 2015 19:35:42 +0000 Subject: SIZEOF replaced with more secure analog - _countof git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MsgPopup/src/main.cpp | 6 +++--- plugins/MsgPopup/src/options.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/MsgPopup') diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index 567a5402bf..1bbfba97a2 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -199,9 +199,9 @@ void LoadConfig() { for (int indx = 0; indx < 4; indx++) { char szNameFG[4], szNameBG[4], szNameTO[4]; - mir_snprintf(szNameFG, SIZEOF(szNameFG), "FG%d", indx); - mir_snprintf(szNameBG, SIZEOF(szNameBG), "BG%d", indx); - mir_snprintf(szNameTO, SIZEOF(szNameTO), "TO%d", indx); + mir_snprintf(szNameFG, _countof(szNameFG), "FG%d", indx); + mir_snprintf(szNameBG, _countof(szNameBG), "BG%d", indx); + mir_snprintf(szNameTO, _countof(szNameTO), "TO%d", indx); options.FG[indx] = db_get_dw(NULL, SERVICENAME, szNameFG, optionsDefault.FG[indx]); options.BG[indx] = db_get_dw(NULL, SERVICENAME, szNameBG, optionsDefault.BG[indx]); options.Timeout[indx] = db_get_dw(NULL, SERVICENAME, szNameTO, (DWORD)optionsDefault.Timeout[indx]); diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp index 3fe5552085..a57f74a925 100644 --- a/plugins/MsgPopup/src/options.cpp +++ b/plugins/MsgPopup/src/options.cpp @@ -99,9 +99,9 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l int indx; for (indx = 0; indx < 4; indx++) { - mir_snprintf(szNameFG, SIZEOF(szNameFG), "FG%d", indx); - mir_snprintf(szNameBG, SIZEOF(szNameBG), "BG%d", indx); - mir_snprintf(szNameTO, SIZEOF(szNameTO), "TO%d", indx); + mir_snprintf(szNameFG, _countof(szNameFG), "FG%d", indx); + mir_snprintf(szNameBG, _countof(szNameBG), "BG%d", indx); + mir_snprintf(szNameTO, _countof(szNameTO), "TO%d", indx); DBWriteContactSettingDwordDef(NULL, SERVICENAME, szNameFG, options.FG[indx], optionsDefault.FG[indx]); DBWriteContactSettingDwordDef(NULL, SERVICENAME, szNameBG, options.BG[indx], optionsDefault.BG[indx]); -- cgit v1.2.3