Various fixups and checks to make scan-build happy

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

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index bd2eb6821cc6d25ec9533c0f6b305e2eb2bb288c..66f34b6e749c8e52b5de70f8ed9c7acc7f1b8b7c 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -1052,7 +1052,9 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
                struct pmenu_item *item;
                unsigned int j;
                result = set_menu_items(cui->main->ncm, NULL);
-               for (j = 0 ; j < cui->main->item_count; j++) {
+               if (result)
+                       pb_log_fn("unset_menu_items failed: %d\n", result);
+               for (j = 0 ; j < cui->main->item_count && !result; j++) {
                        item = item_userptr(cui->main->items[j]);
                        if (item->on_execute != menu_plugin_execute)
                                continue;