From 3f8ae91c0913ec34baea73adb4368a44a41e9416 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:32:21 +0100
Subject: [PATCH] Use FOR_LIST_ELEMENTS convenience macros

---
 include/grub/command.h      | 2 +-
 include/grub/partition.h    | 2 +-
 include/grub/term.h         | 8 ++++----
 normal/auth.c               | 2 +-
 tests/lib/functional_test.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/grub/command.h b/include/grub/command.h
index 3fad88ed0..6bd3d07c9 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -115,7 +115,7 @@ grub_command_execute (const char *name, int argc, char **argv)
   return (cmd) ? cmd->func (cmd, argc, argv) : GRUB_ERR_FILE_NOT_FOUND;
 }
 
-#define FOR_COMMANDS(var) for ((var) = grub_command_list; (var); (var) = (var)->next)
+#define FOR_COMMANDS(var) FOR_LIST_ELEMENTS((var), grub_command_list)
 
 void grub_register_core_commands (void);
 
diff --git a/include/grub/partition.h b/include/grub/partition.h
index 80a9c15f0..722c7b3e0 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -91,7 +91,7 @@ grub_partition_map_unregister (grub_partition_map_t partmap)
 		    GRUB_AS_LIST (partmap));
 }
 
-#define FOR_PARTITION_MAPS(var) for (var = grub_partition_map_list; var; var = var->next)
+#define FOR_PARTITION_MAPS(var) FOR_LIST_ELEMENTS((var), (grub_partition_map_list))
 
 
 static inline grub_disk_addr_t
diff --git a/include/grub/term.h b/include/grub/term.h
index 143aabe1e..230436388 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -245,10 +245,10 @@ grub_term_unregister_output (grub_term_output_t term)
 		    GRUB_AS_LIST (term));
 }
 
-#define FOR_ACTIVE_TERM_INPUTS(var) for (var = grub_term_inputs; var; var = var->next)
-#define FOR_DISABLED_TERM_INPUTS(var) for (var = grub_term_inputs_disabled; var; var = var->next)
-#define FOR_ACTIVE_TERM_OUTPUTS(var) for (var = grub_term_outputs; var; var = var->next)
-#define FOR_DISABLED_TERM_OUTPUTS(var) for (var = grub_term_outputs_disabled; var; var = var->next)
+#define FOR_ACTIVE_TERM_INPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_inputs))
+#define FOR_DISABLED_TERM_INPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_inputs_disabled))
+#define FOR_ACTIVE_TERM_OUTPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_outputs))
+#define FOR_DISABLED_TERM_OUTPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_outputs_disabled))
 
 void EXPORT_FUNC(grub_putchar) (int c);
 void EXPORT_FUNC(grub_putcode) (grub_uint32_t code,
diff --git a/normal/auth.c b/normal/auth.c
index 87337afda..c28f50024 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -140,7 +140,7 @@ is_authenticated (const char *userlist)
   if (!superusers)
     return 1;
 
-  for (user = users; user; user = user->next)
+  FOR_LIST_ELEMENTS (user, users)
     {
       if (!(user->authenticated))
 	continue;
diff --git a/tests/lib/functional_test.c b/tests/lib/functional_test.c
index 33eeec451..6aafe4dbb 100644
--- a/tests/lib/functional_test.c
+++ b/tests/lib/functional_test.c
@@ -28,7 +28,7 @@ grub_functional_test (struct grub_extcmd *cmd __attribute__ ((unused)),
 {
   grub_test_t test;
 
-  for (test = grub_test_list; test; test = test->next)
+  FOR_LIST_ELEMENTS (test, grub_test_list)
     grub_test_run (test);
   return GRUB_ERR_NONE;
 }