X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.h;h=693b96c8efd84b0988d79f006b2c089c8ed43545;hp=f010835a378371c5a92c3d27a54219aea7c53f6b;hb=2a6f3ebc8263e94441c2c865a6b28dae40e35990;hpb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index f010835..693b96c 100644
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -19,6 +19,8 @@
 #if !defined(_PB_NC_MENU_H)
 #define _PB_NC_MENU_H
 
+#include <assert.h>
+
 #include <linux/input.h> /* This must be included before ncurses.h */
 #if defined HAVE_NCURSESW_MENU_H
 #  include <ncursesw/menu.h>
@@ -47,7 +49,7 @@ struct pmenu_item {
 	ITEM *nci;
 	struct pmenu *pmenu;
 	void *data;
-	int (*on_edit)(struct pmenu_item *item);
+	void (*on_edit)(struct pmenu_item *item);
 	int (*on_execute)(struct pmenu_item *item);
 };
 
@@ -85,7 +87,7 @@ struct pmenu {
 	unsigned int insert_pt;
 	int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
 	void (*on_exit)(struct pmenu *menu);
-	void (*on_open)(struct pmenu *menu);
+	void (*on_new)(struct pmenu *menu);
 };
 
 struct pmenu *pmenu_init(void *ui_ctx, unsigned int item_count,
@@ -114,26 +116,18 @@ static inline struct pmenu *pmenu_from_scr(struct nc_scr *scr)
 
 /* debug routines */
 
-#if defined(DEBUG)
-enum {do_debug = 1};
-#else
-enum {do_debug = 0};
-#endif
-
 static inline void pmenu_dump_item(const ITEM *item)
 {
-	if (do_debug)
-		pb_log("%p %s\n", item, (item ? item->name.str : "(null)"));
+	pb_debug("%p %s\n", item, (item ? item->name.str : "(null)"));
 }
 
 static inline void pmenu_dump_items(ITEM *const *items, unsigned int count)
 {
 	unsigned int i;
 
-	if (do_debug)
-		for (i = 0; i < count; i++)
-			pb_log("%u: %p %s\n", i, items[i],
-				(items[i] ? items[i]->name.str : "(null)"));
+	for (i = 0; i < count; i++)
+		pb_debug("%u: %p %s\n", i, items[i],
+			(items[i] ? items[i]->name.str : "(null)"));
 }
 
 #endif