ui/ncurses: Use pmenu_item destrutor to free ncurses ITEMs

Currently, pemnu_destroy is used to free items. This means that the menu
code needs to iterate over items, and we have no way to free the ITEM *
of items that aren't in a menu.

Instead, free the ITEM in the pmenu_item destructor.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 5691f4284942bba265ad7f87a2857ce615fd03b5..745c1ff15f2a6cba0d7f71caac91b902e2795893 100644 (file)
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -76,6 +76,13 @@ 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_create - Allocate and initialize a new pmenu_item instance.
  *
@@ -96,6 +103,8 @@ struct pmenu_item *pmenu_item_create(struct pmenu *menu, const char *name)
                return NULL;
        }
 
+       talloc_set_destructor(item, pmenu_item_destructor);
+
        set_item_userptr(item->nci, item);
 
        return item;
@@ -270,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. */
@@ -356,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);