2008-08-28 Robert Millan <rmh@aybabtu.com>

        Change find_grub_drive() syntax so it doesn't prevent it from
        detecting NULL names as errors.

        * util/biosdisk.c (find_grub_drive): Move free slot search code
        from here ...
        (find_free_slot): ... to here.
        (read_device_map): Use find_free_slot() to search for free slots.

diff --git a/ChangeLog b/ChangeLog
index 1cf7194c6f94effb55f40ed52d0d837c36dd6764..52fa13effb263b5a38196f576a24d99f730279dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-28  Robert Millan  <rmh@aybabtu.com>
+
+       Change find_grub_drive() syntax so it doesn't prevent it from
+       detecting NULL names as errors.
+
+       * util/biosdisk.c (find_grub_drive): Move free slot search code
+       from here ...
+       (find_free_slot): ... to here.
+       (read_device_map): Use find_free_slot() to search for free slots.
+
 2008-08-27  Marco Gerards  <marco@gnu.org>
 
        * conf/common.rmk (pkglib_MODULES): Add scsi.mod.

diff --git a/util/biosdisk.c b/util/biosdisk.c
index fa1143b1f0cb310cea1c8f0e15dd92a585fa77da..9fc1583734f976689c13ba0046402810fdbebd87 100644 (file)
--- a/util/biosdisk.c
+++ b/util/biosdisk.c
@@ -120,12 +120,16 @@ find_grub_drive (const char *name)
        if (map[i].drive && ! strcmp (map[i].drive, name))
          return i;
     }
-  else
-    {
-      for (i = 0; i < sizeof (map) / sizeof (map[0]); i++)
-       if (! map[i].drive)
-         return i;
-    }
+
+  return -1;
+}
+
+static int
+find_free_slot ()
+{
+  for (i = 0; i < sizeof (map) / sizeof (map[0]); i++)
+    if (! map[i].drive)
+      return i;
 
   return -1;
 }
@@ -503,7 +507,7 @@ read_device_map (const char *dev_map)
 
       p++;
       /* Find a free slot.  */
-      drive = find_grub_drive (NULL);
+      drive = find_free_slot ();
       if (drive < 0)
        show_error ("Map table size exceeded");