From a75d6dacc3832c9c07eef3bfb35d591eec5b6a58 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sat, 21 Aug 2010 17:03:20 +0200 Subject: menu: simplify menu_free with list_for_each_entry_safe Signed-off-by: Sascha Hauer --- common/menu.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'common/menu.c') diff --git a/common/menu.c b/common/menu.c index 9c40365e1a..6fd74a05ad 100644 --- a/common/menu.c +++ b/common/menu.c @@ -39,21 +39,15 @@ struct menu* menu_get_menus(void) void menu_free(struct menu *m) { - struct list_head *pos; - struct menu_entry *me; + struct menu_entry *me, *tmp; if (!m) return; free(m->name); free(m->display); - pos = &m->entries.list; - - if (pos->prev != pos->next && pos->prev != 0) - list_for_each(pos, &m->entries.list) { - me = list_entry(pos, struct menu_entry, list); - menu_entry_free(me); - } + list_for_each_entry_safe(me, tmp, &m->entries.list, list) + menu_entry_free(me); free(m); } -- cgit v1.2.3