ui/ncurses: Remove pmenu_item_replace

[petitboot] / ui / ncurses / nc-menu.h

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 693b96c8efd84b0988d79f006b2c089c8ed43545..63da2e55ca58e82cdf99c0319219ed0196fdffe3 100644 (file)
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -56,7 +56,6 @@ struct pmenu_item {
 struct pmenu_item *pmenu_item_alloc(struct pmenu *menu);
 struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
        unsigned int index, const char *name);
-int pmenu_item_replace(struct pmenu_item *i, const char *name);
 void pmenu_item_delete(struct pmenu_item *item);
 
 static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
@@ -67,10 +66,22 @@ static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
        return item;
 }
 
+static inline struct cui_opt_data *cod_from_item(struct pmenu_item *item)
+{
+       return item->data;
+}
+
 static inline struct pmenu_item *pmenu_item_init(struct pmenu *menu,
        unsigned int index, const char *name)
 {
-       return pmenu_item_setup(menu, pmenu_item_alloc(menu), index, name);
+       struct pmenu_item *item = pmenu_item_alloc(menu);
+
+       if (pmenu_item_setup(menu, item, index, name)) {
+               talloc_free(item);
+               item = NULL;
+       }
+
+       return item;
 }
 
 /**
@@ -85,6 +96,8 @@ struct pmenu {
        ITEM **items;
        unsigned int item_count;
        unsigned int insert_pt;
+       const char *help_title;
+       const char *help_text;
        int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
        void (*on_exit)(struct pmenu *menu);
        void (*on_new)(struct pmenu *menu);