diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-19 19:35:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-19 19:35:42 +0000 |
| commit | 4c814798c7bc7f6a0f92c21b027b26290622aa2f (patch) | |
| tree | 9bbfb38bd639f352300aa16ff7c45f5a9b2dba6d /plugins/Clist_modern/src/modern_clistmenus.cpp | |
| parent | f0f0cd088f1ec3a85abee825ddbc214f3f6b92c3 (diff) | |
SIZEOF replaced with more secure analog - _countof
git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_clistmenus.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clistmenus.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 3f9bf7bc7c..41dce30d7c 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -94,8 +94,8 @@ static IconItem iconList[] = static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
{
BYTE bContactRate = db_get_b(hContact, "CList", "Rate", 0);
- if (bContactRate > SIZEOF(rates) - 1)
- bContactRate = SIZEOF(rates) - 1;
+ if (bContactRate > _countof(rates) - 1)
+ bContactRate = _countof(rates) - 1;
BOOL bModifyMenu = FALSE;
@@ -130,12 +130,12 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM) mi.hParentMenu = hFavoriteContactMenu;
if (!hFavoriteContactMenuItems) {
- hFavoriteContactMenuItems = (HGENMENU *)malloc(sizeof(HANDLE) * SIZEOF(rates));
- memset(hFavoriteContactMenuItems, 0, sizeof(HANDLE) * SIZEOF(rates));
+ hFavoriteContactMenuItems = (HGENMENU *)malloc(sizeof(HANDLE) * _countof(rates));
+ memset(hFavoriteContactMenuItems, 0, sizeof(HANDLE) * _countof(rates));
}
int i;
- for (i = 0; i < SIZEOF(rates); i++) {
+ for (i = 0; i < _countof(rates); i++) {
mi.icolibItem = iconList[i].hIcolib;
mi.ptszName = rates[i];
mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | ((bContactRate == i) ? CMIF_CHECKED : 0);
@@ -181,7 +181,7 @@ INT_PTR FAV_ToggleShowOffline(WPARAM hContact, LPARAM) int LoadFavoriteContactMenu()
{
- Icon_Register(g_hInst, LPGEN("Contact list"), iconList, SIZEOF(iconList));
+ Icon_Register(g_hInst, LPGEN("Contact list"), iconList, _countof(iconList));
CreateServiceFunction(CLUI_FAVSETRATE, FAV_SetRate);
CreateServiceFunction(CLUI_FAVTOGGLESHOWOFFLINE, FAV_ToggleShowOffline);
|