From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 5/9] menu: use list_for_each_entry where appropriate
Date: Mon, 23 Aug 2010 08:24:09 +0200 [thread overview]
Message-ID: <1282544653-11508-6-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1282544653-11508-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/menu.c | 9 ++-------
| 21 +++++----------------
2 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/commands/menu.c b/commands/menu.c
index 48834f3..5efaa61 100644
--- a/commands/menu.c
+++ b/commands/menu.c
@@ -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);
--git a/common/menu.c b/common/menu.c
index 27c591a..3596e21 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -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);
}
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2010-08-23 6:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 6:24 Update patches for menu framework Sascha Hauer
2010-08-23 6:24 ` [PATCH 1/9] menu: initialize entries list in menu_alloc Sascha Hauer
2010-08-23 6:24 ` [PATCH 2/9] menu: Use strdup instead of malloc/strncpy Sascha Hauer
2010-08-23 6:24 ` [PATCH 3/9] menu: simplify menu_free with list_for_each_entry_safe Sascha Hauer
2010-08-23 6:24 ` [PATCH 4/9] menu: remove superfluous struct menu_entry member from struct menu Sascha Hauer
2010-08-23 6:24 ` Sascha Hauer [this message]
2010-08-23 6:24 ` [PATCH 6/9] menu: use an initialized struct list as menu list Sascha Hauer
2010-08-23 6:24 ` [PATCH 7/9] menu: fix memory corruption Sascha Hauer
2010-08-23 11:40 ` Jean-Christophe PLAGNIOL-VILLARD
2010-08-23 12:44 ` Uwe Kleine-König
2010-08-23 6:24 ` [PATCH 8/9] menu: do not go to free if there's nothing to free Sascha Hauer
2010-08-23 6:24 ` [PATCH 9/9] menu: simplify usage for clients Sascha Hauer
2010-08-23 15:18 ` Jean-Christophe PLAGNIOL-VILLARD
2010-08-23 16:49 ` Sascha Hauer
2010-08-26 16:19 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282544653-11508-6-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox