From 0959e5ec30d629f661129bbaf4dfed8c41c7a5d9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 20:20:52 +0100
Subject: [PATCH] Remove grub_list_pop

---
 gettext/gettext.c   | 10 +++-------
 include/grub/list.h |  1 -
 kern/list.c         | 12 ------------
 normal/handler.c    |  8 +++++---
 tests/lib/test.c    |  4 +++-
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/gettext/gettext.c b/gettext/gettext.c
index 0aa8decbd..bc7d42824 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -309,14 +309,10 @@ grub_gettext_init_ext (const char *lang)
 static void
 grub_gettext_delete_list (void)
 {
-  struct grub_gettext_msg *item;
-
-  while ((item =
-	  grub_list_pop (GRUB_AS_LIST_P (&grub_gettext_msg_list))) != 0)
+  while (grub_gettext_msg_list)
     {
-      char *original = (char *) ((struct grub_gettext_msg *) item)->name;
-      grub_free (original);
-
+      grub_free ((char *) grub_gettext_msg_list->name);
+      grub_gettext_msg_list = grub_gettext_msg_list->next;
       /* Don't delete the translated message because could be in use.  */
     }
 }
diff --git a/include/grub/list.h b/include/grub/list.h
index d3abd69c4..75353010c 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -31,7 +31,6 @@ struct grub_list
 typedef struct grub_list *grub_list_t;
 
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
-void * EXPORT_FUNC(grub_list_pop) (grub_list_t *head);
 void EXPORT_FUNC(grub_list_remove) (grub_list_t *head, grub_list_t item);
 
 #define FOR_LIST_ELEMENTS(var, list) for ((var) = (list); (var); (var) = (var)->next)
diff --git a/kern/list.c b/kern/list.c
index 5b0248129..33c334166 100644
--- a/kern/list.c
+++ b/kern/list.c
@@ -28,18 +28,6 @@ grub_list_push (grub_list_t *head, grub_list_t item)
   *head = item;
 }
 
-void *
-grub_list_pop (grub_list_t *head)
-{
-  grub_list_t item;
-
-  item = *head;
-  if (item)
-    *head = item->next;
-
-  return item;
-}
-
 void
 grub_list_remove (grub_list_t *head, grub_list_t item)
 {
diff --git a/normal/handler.c b/normal/handler.c
index 8c97fd9a8..4c8b8f769 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -33,7 +33,7 @@ struct grub_handler_list
   grub_command_t cmd;
 };
 
-static grub_list_t handler_list;
+static struct grub_handler_list *handler_list;
 
 static grub_err_t
 grub_handler_cmd (struct grub_command *cmd,
@@ -127,7 +127,7 @@ insert_handler (char *name, char *module)
     }
 
   item->cmd->data = data;
-  grub_list_push (&handler_list, GRUB_AS_LIST (item));
+  grub_list_push (GRUB_AS_LIST_P (&handler_list), GRUB_AS_LIST (item));
 }
 
 /* Read the file handler.lst for auto-loading.  */
@@ -211,8 +211,10 @@ free_handler_list (void)
 {
   struct grub_handler_list *item;
 
-  while ((item = grub_list_pop (&handler_list)) != 0)
+  while (handler_list)
     {
+      item = handler_list;
+      handler_list = handler_list->next;
       grub_free (item->cmd->data);
       grub_unregister_command (item->cmd);
       grub_free (item->name);
diff --git a/tests/lib/test.c b/tests/lib/test.c
index 3029495c6..06d78b7d7 100644
--- a/tests/lib/test.c
+++ b/tests/lib/test.c
@@ -66,8 +66,10 @@ free_failures (void)
 {
   grub_test_failure_t item;
 
-  while ((item = grub_list_pop (GRUB_AS_LIST_P (&failure_list))) != 0)
+  while (failure_list)
     {
+      item = failure_list;
+      failure_list = item->next;
       if (item->message)
 	grub_free (item->message);