ui/ncurses: Use pmenu_item destrutor to free ncurses ITEMs

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

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index cd7c54e6b67c4dde5fe39d0f613ae701fc6e568e..745c1ff15f2a6cba0d7f71caac91b902e2795893 100644 (file)
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -76,46 +76,49 @@ static void pmenu_resize(struct nc_scr *scr)
        pmenu_post(scr);
 }
 
+static int pmenu_item_destructor(void *arg)
+{
+       struct pmenu_item *item = arg;
+       free_item(item->nci);
+       return 0;
+}
+
 /**
- * pmenu_item_init - Allocate and initialize a new pmenu_item instance.
+ * pmenu_item_create - Allocate and initialize a new pmenu_item instance.
  *
  * Returns a pointer the the initialized struct pmenu_item instance or NULL
  * on error. The caller is responsible for calling talloc_free() for the
  * returned instance.
  */
-
-struct pmenu_item *pmenu_item_alloc(struct pmenu *menu)
+struct pmenu_item *pmenu_item_create(struct pmenu *menu, const char *name)
 {
-       /* Items go with the menu, not the pointer array. */
+       struct pmenu_item *item = talloc_zero(menu, struct pmenu_item);
 
-       struct pmenu_item *i = talloc_zero(menu, struct pmenu_item);
+       item->i_sig = pb_item_sig;
+       item->pmenu = menu;
+       item->nci = new_item(name, NULL);
 
-       return i;
-}
-
-struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
-       unsigned int index, const char *name)
-{
-       assert(i);
-       assert(name);
-
-       if (!i)
+       if (!item->nci) {
+               talloc_free(item);
                return NULL;
+       }
 
-       i->i_sig = pb_item_sig;
-       i->pmenu = menu;
-       i->nci = new_item(name, NULL);
+       talloc_set_destructor(item, pmenu_item_destructor);
 
-       if (!i->nci) {
-               talloc_free(i);
-               return NULL;
-       }
+       set_item_userptr(item->nci, item);
 
-       set_item_userptr(i->nci, i);
+       return item;
+}
 
-       menu->items[index] = i->nci;
+void pmenu_item_insert(struct pmenu *menu, struct pmenu_item *item,
+       unsigned int index)
+{
+       assert(item);
+       assert(index < menu->item_count);
+       assert(menu->items[index] == NULL);
+       assert(menu_items(menu->ncm) == NULL);
 
-       return i;
+       menu->items[index] = item->nci;
 }
 
 static int pmenu_item_get_index(const struct pmenu_item *item)
@@ -131,54 +134,6 @@ static int pmenu_item_get_index(const struct pmenu_item *item)
        return -1;
 }
 
-/**
- * pmenu_item_replace - Replace the menu item with a new one.
- *
- * Use this routine to change a menu item's text.
- */
-
-int pmenu_item_replace(struct pmenu_item *i, const char *name)
-{
-       struct pmenu *menu;
-       ITEM *nci;
-       int index;
-
-       assert(name);
-       assert(i->nci);
-
-       menu = i->pmenu;
-       index = pmenu_item_get_index(i);
-
-       if (index < 0) {
-               assert(0 && "get_index failed");
-               return -1;
-       }
-
-       nci = new_item(name, NULL);
-
-       if (!nci) {
-               assert(0 && "new_item failed");
-               return -1;
-       }
-
-       set_item_userptr(nci, i);
-
-       nc_scr_unpost(&menu->scr);
-       set_menu_items(menu->ncm, NULL);
-
-       // FIXME: need to assure item name is a talloc string.
-       /* talloc_free((char *)item_name(i->nci)); */
-
-       free_item(i->nci);
-       menu->items[index] = nci;
-       i->nci = nci;
-
-       set_menu_items(menu->ncm, menu->items);
-       nc_scr_post(&menu->scr);
-
-       return 0;
-}
-
 /**
  * pmenu_move_cursor - Move the cursor.
  * @req: An ncurses request or char to send to menu_driver().
@@ -324,7 +279,6 @@ int pmenu_remove(struct pmenu *menu, struct pmenu_item *item)
        if (index < 0)
                return -1;
 
-       free_item(item->nci);
        talloc_free(item);
 
        /* Note that items array has a null terminator. */
@@ -410,14 +364,9 @@ int pmenu_setup(struct pmenu *menu)
 
 void pmenu_delete(struct pmenu *menu)
 {
-       unsigned int i;
-
        assert(menu->scr.sig == pb_pmenu_sig);
        menu->scr.sig = pb_removed_sig;
 
-       for (i = item_count(menu->ncm); i; i--)
-               free_item(menu->items[i - 1]);
-
        free_menu(menu->ncm);
        delwin(menu->scr.sub_ncw);
        delwin(menu->scr.main_ncw);