X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.h;h=63da2e55ca58e82cdf99c0319219ed0196fdffe3;hp=f5e947d24ea9f59ebe6e5f81361f43786230d043;hb=a83a614d94b09d063d56bf28be6f9dd0d0e22854;hpb=6e46a2e3a2d69e1982ed531ed69def8f9a5e8af1 diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h index f5e947d..63da2e5 100644 --- 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) @@ -75,7 +74,14 @@ static inline struct cui_opt_data *cod_from_item(struct pmenu_item *item) 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; } /**