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 --- protocols/Twitter/src/theme.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/Twitter/src/theme.cpp') diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index 8dcf0c2069..71e6d0316b 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -31,18 +31,18 @@ static IconItem icons[] = { LPGEN("Visit Homepage"), "homepage", 0 }, }; -static HANDLE hIconLibItem[SIZEOF(icons)]; +static HANDLE hIconLibItem[_countof(icons)]; // TODO: uninit void InitIcons(void) { - Icon_Register(g_hInstance, "Protocols/Twitter", icons, SIZEOF(icons), "Twitter"); - icons[SIZEOF(icons) - 1].hIcolib = Skin_GetIconHandle(SKINICON_EVENT_URL); + Icon_Register(g_hInstance, "Protocols/Twitter", icons, _countof(icons), "Twitter"); + icons[_countof(icons) - 1].hIcolib = Skin_GetIconHandle(SKINICON_EVENT_URL); } HANDLE GetIconHandle(const char* name) { - for (size_t i = 0; i < SIZEOF(icons); i++) + for (size_t i = 0; i < _countof(icons); i++) if (mir_strcmp(icons[i].szName, name) == 0) return hIconLibItem[i]; @@ -106,16 +106,16 @@ void InitContactMenus() void UninitContactMenus() { - for (size_t i = 0; i < SIZEOF(g_hMenuItems); i++) + for (size_t i = 0; i < _countof(g_hMenuItems); i++) CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuItems[i], 0); UnhookEvent(g_hMenuEvts[0]); - for (size_t i = 1; i < SIZEOF(g_hMenuEvts); i++) + for (size_t i = 1; i < _countof(g_hMenuEvts); i++) DestroyServiceFunction(g_hMenuEvts[i]); } void ShowContactMenus(bool show) { - for (size_t i = 0; i < SIZEOF(g_hMenuItems); i++) + for (size_t i = 0; i < _countof(g_hMenuItems); i++) Menu_ShowItem(g_hMenuItems[i], show); } -- cgit v1.2.3