From 2322a1269372e8b9186da63c2384a407f73cbffb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 24 Dec 2009 16:25:10 +0100
Subject: [PATCH] remove list iterators to save space

---
 kern/term.c | 85 +++++++++++++++++------------------------------------
 1 file changed, 27 insertions(+), 58 deletions(-)

diff --git a/kern/term.c b/kern/term.c
index b71c12334..d0d29eb9c 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -67,24 +67,16 @@ grub_putchar (int c)
   grub_uint32_t code;
   grub_ssize_t ret;
 
-  auto int do_putcode (grub_list_t item);
-  int do_putcode (grub_list_t item)
-  {
-    struct grub_term_output *term = (struct grub_term_output *) item;
-
-    if (grub_term_is_active (term))
-      grub_putcode (code, term);
-
-    return 0;
-  }
-
   buf[size++] = c;
   ret = grub_utf8_to_ucs4 (&code, 1, buf, size, 0);
 
   if (ret != 0)
     {
+      struct grub_term_output *term;
       size = 0;
-      grub_list_iterate (GRUB_AS_LIST (grub_term_outputs), do_putcode);
+      for (term = grub_term_outputs; term; term = term->next)
+	if (grub_term_is_active (term))
+	  grub_putcode (code, term);
     }
   if (ret == '\n' && grub_newline_hook)
     grub_newline_hook ();
@@ -114,62 +106,39 @@ grub_getkeystatus (void)
 void
 grub_cls (void)
 {
-  auto int hook (grub_list_t item);
-  int hook (grub_list_t item)
-  {
-    struct grub_term_output *term = (struct grub_term_output *) item;
+  struct grub_term_output *term;
+  
+  for (term = grub_term_outputs; term; term = term->next)
+    {
+      if (! grub_term_is_active (term))
+	continue;
 
-    if (! grub_term_is_active (term))
-      return 0;
-
-    if ((term->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
-      {
-	grub_putcode ('\n', term);
-	grub_refresh ();
-      }
-    else
-      (term->cls) ();
-
-    return 0;
-  }
-
-  grub_list_iterate (GRUB_AS_LIST (grub_term_outputs), hook);
+      if ((term->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
+	{
+	  grub_putcode ('\n', term);
+	  grub_refresh ();
+	}
+      else
+	(term->cls) ();
+    }
 }
 
 void
 grub_setcolorstate (grub_term_color_state state)
 {
-  auto int hook (grub_list_t item);
-  int hook (grub_list_t item)
-  {
-    struct grub_term_output *term = (struct grub_term_output *) item;
-
-    if (! grub_term_is_active (term))
-      return 0;
-
-    grub_term_setcolorstate (term, state);
-
-    return 0;
-  }
-
-  grub_list_iterate (GRUB_AS_LIST (grub_term_outputs), hook);
+  struct grub_term_output *term;
+  
+  for (term = grub_term_outputs; term; term = term->next)
+    if (grub_term_is_active (term))
+      grub_term_setcolorstate (term, state);
 }
 
 void
 grub_refresh (void)
 {
-  auto int hook (grub_list_t item);
-  int hook (grub_list_t item)
-  {
-    struct grub_term_output *term = (struct grub_term_output *) item;
+  struct grub_term_output *term;
 
-    if (!grub_term_is_active (term))
-      return 0;
-
-    grub_term_refresh (term);
-
-    return 0;
-  }
-
-  grub_list_iterate (GRUB_AS_LIST (grub_term_outputs), hook);
+  for (term = grub_term_outputs; term; term = term->next)
+    if (grub_term_is_active (term))
+      grub_term_refresh (term);
 }