X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=54d82ff887196b817a20a4cbbac2777ec6c474e0;hp=90a2c0a996c6b9704653657f8a291fc1d2709892;hb=5b3dd56d982629349e612b9e984e65dec09b438f;hpb=d90efe9e2bbfb18ee05ec2032b5723dbfa902d82

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 90a2c0a..54d82ff 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -123,6 +123,31 @@ static const char *pmenu_item_label(struct pmenu_item *item, const char *name)
 	return label;
 }
 
+/**
+ * pmenu_item_update - Update the label of an existing pmenu_item.
+ *
+ * The item array must be disconnected prior to calling.
+ */
+int pmenu_item_update(struct pmenu_item *item, const char *name)
+{
+	const char *label;
+	ITEM *i;
+
+	if (!item || !item->nci)
+		return -1;
+
+	label = pmenu_item_label(item, name);
+
+	if (!label)
+		return -1;
+
+	i = item->nci;
+	i->name.str = label;
+	i->name.length = strncols(label);
+
+	return 0;
+}
+
 /**
  * pmenu_item_create - Allocate and initialize a new pmenu_item instance.
  *
@@ -230,7 +255,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 
 	for (i = 0; i < menu->item_count; i++) {
 		item = item_userptr(menu->items[i]);
-		cod = item->data;
+		cod = cod_from_item(item);
 		/* boot entries will have opt defined */
 		if (!cod || cod->opt)
 			continue;
@@ -314,10 +339,9 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 
 	/* We identify dev_hdr items as having a valid c->name,
 	 * but a NULL c->opt */
-	cod = talloc(dev_hdr, struct cui_opt_data);
+	cod = talloc_zero(dev_hdr, struct cui_opt_data);
 	cod->name = talloc_strdup(dev_hdr, opt->device_id);
 	cod->dev = dev;
-	cod->opt = NULL;
 	dev_hdr->data = cod;
 
 	pb_debug("%s: returning %s\n",__func__,cod->name);