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/SimpleStatusMsg/src/utils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/SimpleStatusMsg/src/utils.cpp') diff --git a/plugins/SimpleStatusMsg/src/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp index cff6593801..486bf5481d 100644 --- a/plugins/SimpleStatusMsg/src/utils.cpp +++ b/plugins/SimpleStatusMsg/src/utils.cpp @@ -36,19 +36,19 @@ static IconItem iconList[] = void IconsInit(void) { - Icon_Register(g_hInst, LPGEN("Simple Status Message"), iconList, SIZEOF(iconList), "SimpleStatusMsg"); + Icon_Register(g_hInst, LPGEN("Simple Status Message"), iconList, _countof(iconList), "SimpleStatusMsg"); } HICON LoadIconEx(const char *name) { char szSettingName[100]; - mir_snprintf(szSettingName, SIZEOF(szSettingName), "SimpleStatusMsg_%s", name); + mir_snprintf(szSettingName, _countof(szSettingName), "SimpleStatusMsg_%s", name); return IcoLib_GetIcon(szSettingName); } HANDLE GetIconHandle(int iconId) { - for(int i = 0; i < SIZEOF(iconList); i++) + for(int i = 0; i < _countof(iconList); i++) if (iconList[i].defIconID == iconId) return iconList[i].hIcolib; @@ -58,14 +58,14 @@ HANDLE GetIconHandle(int iconId) void ReleaseIconEx(const char *name) { char szSettingName[100]; - mir_snprintf(szSettingName, SIZEOF(szSettingName), "SimpleStatusMsg_%s", name); + mir_snprintf(szSettingName, _countof(szSettingName), "SimpleStatusMsg_%s", name); IcoLib_Release(szSettingName); } HANDLE HookProtoEvent(const char *szModule, const char *szEvent, MIRANDAHOOKPARAM hookProc) { char szProtoEvent[MAXMODULELABELLENGTH]; - mir_snprintf(szProtoEvent, SIZEOF(szProtoEvent), "%s%s", szModule, szEvent); + mir_snprintf(szProtoEvent, _countof(szProtoEvent), "%s%s", szModule, szEvent); HANDLE res = HookEventParam(szProtoEvent, hookProc, (LPARAM)szModule); arProtoHooks.insert(res); return res; -- cgit v1.2.3