Use FOR_LIST_ELEMENTS convenience macros

diff --git a/include/grub/command.h b/include/grub/command.h
index 3fad88ed0498c9b1a982811bf312088fc02aa70a..6bd3d07c91f5c3aff0bedcc4805809462772657e 100644 (file)
--- 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 80a9c15f08077774a73382f8ba62ddd0f1136eb2..722c7b3e08264fdb79838ddefb2f0d32b1e70931 100644 (file)
--- 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))
 
 \f
 static inline grub_disk_addr_t

diff --git a/include/grub/term.h b/include/grub/term.h
index 143aabe1e4a9f8c259edfdc539b86b4e26bfbd5a..230436388967f27c3bcdb6e39d53debcd82de40f 100644 (file)
--- 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 87337afda0c4c04bdea09db946e4cb01360c17c0..c28f50024e5b9d81b7e946ebad789979548e2c82 100644 (file)
--- 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 33eeec45113c2240a19c48fb795955ac5a6dec52..6aafe4dbb0b29cd01ca9e1a0f80a44878609ed01 100644 (file)
--- 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;
 }