sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

menu: use list_for_each_entry where appropriate 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2010-08-21 18:27:31 +02:00
parent b11b88de64
commit 417e2d45fe
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commands/menu.c
View File

@ -263,13 +263,10 @@ static int do_menu_show(struct cmd_menu *cm)
static void print_entries(struct menu *m)
{
struct list_head *pos;
struct menu_entry *me;
list_for_each(pos, &(m->entries)) {
me = list_entry(pos, struct menu_entry, list);
list_for_each_entry(me, &m->entries, list)
printf("%d: %s\n", me->num, me->display);
}
}
/*
@ -278,7 +275,6 @@ static void print_entries(struct menu *m)
*/
static int do_menu_list(struct cmd_menu *cm)
{
struct list_head *pos;
struct menu* m = NULL;
struct menu* menus = menu_get_menus();
@ -292,8 +288,7 @@ static int do_menu_list(struct cmd_menu *cm)
}
}
list_for_each(pos, &menus->list) {
m = list_entry(pos, struct menu, list);
list_for_each_entry(m, &menus->list, list) {
printf("%s: %s\n", m->name, m->display? m->display : m->name);
if (is_entry(cm))
print_entries(m);

21
common/menu.c
View File

@ -93,7 +93,6 @@ int menu_add_entry(struct menu *m, struct menu_entry *me)
void menu_remove_entry(struct menu *m, struct menu_entry *me)
{
struct list_head *pos;
int i = 1;
if (!m || !me)
@ -102,22 +101,18 @@ void menu_remove_entry(struct menu *m, struct menu_entry *me)
m->nb_entries--;
list_del(&me->list);
list_for_each(pos, &m->entries) {
me = list_entry(pos, struct menu_entry, list);
list_for_each_entry(me, &m->entries, list)
me->num = i++;
}
}
struct menu* menu_get_by_name(char *name)
{
struct list_head *pos;
struct menu* m;
if (!name)
return NULL;
list_for_each(pos, &menus.list) {
m = list_entry(pos, struct menu, list);
list_for_each_entry(m, &menus.list, list) {
if(strcmp(m->name, name) == 0)
return m;
}
@ -127,14 +122,12 @@ struct menu* menu_get_by_name(char *name)
struct menu_entry* menu_entry_get_by_num(struct menu* m, int num)
{
struct list_head *pos;
struct menu_entry* me;
if (!m || num < 1 || num > m->nb_entries)
return NULL;
list_for_each(pos, &m->entries) {
me = list_entry(pos, struct menu_entry, list);
list_for_each_entry(me, &m->entries, list) {
if(me->num == num)
return me;
}
@ -162,14 +155,12 @@ static void print_menu_entry(struct menu *m, struct menu_entry *me, int reverse)
int menu_set_selected_entry(struct menu *m, struct menu_entry* me)
{
struct list_head *pos;
struct menu_entry* tmp;
if (!m || !me)
return -EINVAL;
list_for_each(pos, &m->entries) {
tmp = list_entry(pos, struct menu_entry, list);
list_for_each_entry(tmp, &m->entries, list) {
if(me == tmp) {
m->selected = me;
return 0;
@ -195,7 +186,6 @@ int menu_set_selected(struct menu *m, int num)
static void print_menu(struct menu *m)
{
struct list_head *pos;
struct menu_entry *me;
clear();
@ -207,8 +197,7 @@ static void print_menu(struct menu *m)
puts(m->name);
}
list_for_each(pos, &m->entries) {
me = list_entry(pos, struct menu_entry, list);
list_for_each_entry(me, &m->entries, list) {
if(m->selected != me)
print_menu_entry(m, me, 0);
}