[1877] 2008-09-25 Robert Millan <[email protected]>

Revision: 1877
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1877
Author:   robertmh
Date:     2008-09-25 14:40:59 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
2008-09-25  Robert Millan  <[email protected]>

        * util/grub-mkdevicemap.c (make_device_map): Actually replace all
        instances of grub_util_get_disk_name() (see previous commit).

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-mkdevicemap.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2008-09-25 14:17:43 UTC (rev 1876)
+++ trunk/grub2/ChangeLog	2008-09-25 14:40:59 UTC (rev 1877)
@@ -1,5 +1,10 @@
 2008-09-25  Robert Millan  <[email protected]>
 
+	* util/grub-mkdevicemap.c (make_device_map): Actually replace all
+	instances of grub_util_get_disk_name() (see previous commit).
+
+2008-09-25  Robert Millan  <[email protected]>
+
 	* conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove
 	`util/i386/get_disk_name.c'.
 	* conf/i386-efi.rmk: Likewise.

Modified: trunk/grub2/util/grub-mkdevicemap.c
===================================================================
--- trunk/grub2/util/grub-mkdevicemap.c	2008-09-25 14:17:43 UTC (rev 1876)
+++ trunk/grub2/util/grub-mkdevicemap.c	2008-09-25 14:40:59 UTC (rev 1877)
@@ -483,10 +483,7 @@
       get_virtio_disk_name (name, i);
       if (check_device (name))
 	{
-	  char *p;
-	  p = grub_util_get_disk_name (num_hd, name);
-	  fprintf (fp, "(%s)\t%s\n", p, name);
-	  free (p);
+	  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
 	  num_hd++;
 	}
     }
@@ -512,10 +509,7 @@
       get_xvd_disk_name (name, i);
       if (check_device (name))
 	{
-	  char *p;
-	  p = grub_util_get_disk_name (num_hd, name);
-	  fprintf (fp, "(%s)\t%s\n", p, name);
-	  free (p);
+	  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
 	  num_hd++;
 	}
     }
@@ -573,10 +567,7 @@
 	    get_cciss_disk_name (name, controller, drive);
 	    if (check_device (name))
 	      {
-		char *p;
-		p = grub_util_get_disk_name (num_hd, name);
-		fprintf (fp, "(%s)\t%s\n", p, name);
-		free (p);
+		fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
 		num_hd++;
 	      }
 	  }
@@ -597,10 +588,7 @@
 	    get_ida_disk_name (name, controller, drive);
 	    if (check_device (name))
 	      {
-		char *p;
-		p = grub_util_get_disk_name (num_hd, name);
-		fprintf (fp, "(%s)\t%s\n", p, name);
-		free (p);
+		fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
 		num_hd++;
 	      }
 	  }
@@ -632,10 +620,7 @@
       get_mmc_disk_name (name, i);
       if (check_device (name))
 	{
-	  char *p;
-	  p = grub_util_get_disk_name (num_hd, name);
-	  fprintf (fp, "(%s)\t%s\n", p, name);
-	  free (p);
+	  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
 	  num_hd++;
 	}
     }