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/HistorySweeperLight/src/options.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/HistorySweeperLight') diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index 87dc659185..92746b37e4 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -52,23 +52,23 @@ static IconItem iconList[] = { LPGEN("Delete All"), "actDel", IDI_ACTDEL } }; -static HANDLE hIconLibItem[SIZEOF(iconList)]; +static HANDLE hIconLibItem[_countof(iconList)]; void InitIcons(void) { - Icon_Register(hInst, ModuleName, iconList, SIZEOF(iconList), ModuleName); + Icon_Register(hInst, ModuleName, iconList, _countof(iconList), ModuleName); } HICON LoadIconEx(const char* name) { char szSettingName[100]; - mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", ModuleName, name); + mir_snprintf(szSettingName, _countof(szSettingName), "%s_%s", ModuleName, name); return IcoLib_GetIcon(szSettingName); } HANDLE GetIconHandle(const char* name) { - for (int i = 0; i < SIZEOF(iconList); i++) + for (int i = 0; i < _countof(iconList); i++) if (mir_strcmp(iconList[i].szName, name) == 0) return hIconLibItem[i]; @@ -78,7 +78,7 @@ HANDLE GetIconHandle(const char* name) void ReleaseIconEx(const char* name) { char szSettingName[100]; - mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", ModuleName, name); + mir_snprintf(szSettingName, _countof(szSettingName), "%s_%s", ModuleName, name); IcoLib_Release(szSettingName); } @@ -118,12 +118,12 @@ void LoadSettings(HWND hwndDlg) SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_RESETCONTENT, 0, 0); SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_RESETCONTENT, 0, 0); - for (i = 0; i < SIZEOF(time_stamp_strings); i++) { + for (i = 0; i < _countof(time_stamp_strings); i++) { ptrT ptszTimeStr(Langpack_PcharToTchar(time_stamp_strings[i])); SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_ADDSTRING, 0, (LPARAM)ptszTimeStr); } - for (i = 0; i < SIZEOF(keep_strings); i++) { + for (i = 0; i < _countof(keep_strings); i++) { ptrT ptszTimeStr(Langpack_PcharToTchar(keep_strings[i])); SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_ADDSTRING, 0, (LPARAM)ptszTimeStr); } -- cgit v1.2.3