diff options
author | marcel <marcel@FreeBSD.org> | 2003-09-17 03:45:30 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2003-09-17 03:45:30 +0000 |
commit | e702e4aa8e0bf746fbf5a42608d392446d0035af (patch) | |
tree | c44c1548a247e945fbe1b7da200e15ef03d34ad4 | |
parent | 920cfd2329dab9db239d8e448364bc546c00cc92 (diff) | |
download | FreeBSD-src-e702e4aa8e0bf746fbf5a42608d392446d0035af.zip FreeBSD-src-e702e4aa8e0bf746fbf5a42608d392446d0035af.tar.gz |
Fix 3 'cast to pointer from integer of different size' warnings.
While here, fix the long line bugs in the same statements.
-rw-r--r-- | usr.sbin/sade/dmenu.c | 15 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dmenu.c | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c index 7f113fc..d89f8ce 100644 --- a/usr.sbin/sade/dmenu.c +++ b/usr.sbin/sade/dmenu.c @@ -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) { diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c index 7f113fc..d89f8ce 100644 --- a/usr.sbin/sysinstall/dmenu.c +++ b/usr.sbin/sysinstall/dmenu.c @@ -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) { |