1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-12 09:58:36 +00:00

Fix 3 'cast to pointer from integer of different size' warnings.

While here, fix the long line bugs in the same statements.
This commit is contained in:
Marcel Moolenaar 2003-09-17 03:45:30 +00:00
parent 44ed791b92
commit 9862c36bfb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=120147
2 changed files with 18 additions and 12 deletions

View File

@ -287,16 +287,19 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu
dialog_clear_norefresh();
/* Pop up that dialog! */
if (menu->type & DMENU_NORMAL_TYPE)
rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
menu_height(menu, n), -n, items, (char *)buttons, choice, scroll);
rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt,
-1, -1, menu_height(menu, n), -n, items,
(char *)(uintptr_t)buttons, choice, scroll);
else if (menu->type & DMENU_RADIO_TYPE)
rval = dialog_radiolist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
menu_height(menu, n), -n, items, (char *)buttons);
rval = dialog_radiolist((u_char *)menu->title,
(u_char *)menu->prompt, -1, -1, menu_height(menu, n), -n,
items, (char *)(uintptr_t)buttons);
else if (menu->type & DMENU_CHECKLIST_TYPE)
rval = dialog_checklist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
menu_height(menu, n), -n, items, (char *)buttons);
rval = dialog_checklist((u_char *)menu->title,
(u_char *)menu->prompt, -1, -1, menu_height(menu, n), -n,
items, (char *)(uintptr_t)buttons);
else
msgFatal("Menu: `%s' is of an unknown type\n", menu->title);
if (exited) {

View File

@ -287,16 +287,19 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max, Boolean bu
dialog_clear_norefresh();
/* Pop up that dialog! */
if (menu->type & DMENU_NORMAL_TYPE)
rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
menu_height(menu, n), -n, items, (char *)buttons, choice, scroll);
rval = dialog_menu((u_char *)menu->title, (u_char *)menu->prompt,
-1, -1, menu_height(menu, n), -n, items,
(char *)(uintptr_t)buttons, choice, scroll);
else if (menu->type & DMENU_RADIO_TYPE)
rval = dialog_radiolist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
menu_height(menu, n), -n, items, (char *)buttons);
rval = dialog_radiolist((u_char *)menu->title,
(u_char *)menu->prompt, -1, -1, menu_height(menu, n), -n,
items, (char *)(uintptr_t)buttons);
else if (menu->type & DMENU_CHECKLIST_TYPE)
rval = dialog_checklist((u_char *)menu->title, (u_char *)menu->prompt, -1, -1,
menu_height(menu, n), -n, items, (char *)buttons);
rval = dialog_checklist((u_char *)menu->title,
(u_char *)menu->prompt, -1, -1, menu_height(menu, n), -n,
items, (char *)(uintptr_t)buttons);
else
msgFatal("Menu: `%s' is of an unknown type\n", menu->title);
if (exited) {