[2570] 2009-09-04 Vladimir Serbinenko <address@hidden>

[Vladimir Serbinenko]

Revision: 2570
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2570
Author:   phcoder
Date:     2009-09-04 13:16:07 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
2009-09-04  Vladimir Serbinenko  <address@hidden>

        * loader/i386/xnu.c (grub_cpu_xnu_fill_devicetree): Remove
        unnecessary calls to grub_error.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/xnu.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-09-04 12:59:54 UTC (rev 2569)
+++ trunk/grub2/ChangeLog       2009-09-04 13:16:07 UTC (rev 2570)
@@ -1,3 +1,8 @@
+2009-09-04  Vladimir Serbinenko  <address@hidden>
+
+       * loader/i386/xnu.c (grub_cpu_xnu_fill_devicetree): Remove
+       unnecessary calls to grub_error.
+
 2009-09-04  Colin Watson  <address@hidden>
 
        * NEWS: Mention `keystatus' and Unicode fonts.

Modified: trunk/grub2/loader/i386/xnu.c
===================================================================
--- trunk/grub2/loader/i386/xnu.c       2009-09-04 12:59:54 UTC (rev 2569)
+++ trunk/grub2/loader/i386/xnu.c       2009-09-04 13:16:07 UTC (rev 2570)
@@ -247,7 +247,7 @@
   curval->datasize = (SYSTEM_TABLE_SIZEOF (firmware_revision));
   curval->data = grub_malloc (curval->datasize);
   if (! curval->data)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't create device tree");
+    return grub_errno;
   grub_memcpy (curval->data, (SYSTEM_TABLE_VAR(firmware_revision)),
               curval->datasize);
 
@@ -268,7 +268,7 @@
   curval->datasize = sizeof ("EFI32");
   curval->data = grub_malloc (curval->datasize);
   if (! curval->data)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't create device tree");
+    return grub_errno;
   if (SIZEOF_OF_UINTN == 4)
     grub_memcpy (curval->data, "EFI32", curval->datasize);
   else
@@ -287,7 +287,7 @@
   curval->datasize = sizeof (grub_uint64_t);
   curval->data = grub_malloc (curval->datasize);
   if (!curval->data)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "couldn't create device tree");
+    return grub_errno;
 
   /* First see if user supplies the value. */
   char *fsbvar = grub_env_get ("fsb");
@@ -373,8 +373,7 @@
       curval->datasize = SIZEOF_OF_UINTN;
       curval->data = grub_malloc (curval->datasize);
       if (! curval->data)
-       return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                          "couldn't create device tree");
+       return grub_errno;
       if (SIZEOF_OF_UINTN == 4)
        *((grub_uint32_t *)curval->data) = PTR_TO_UINT32 (ptr);
       else
@@ -392,8 +391,7 @@
          curval->datasize = grub_strlen (table_aliases[j].name) + 1;
          curval->data = grub_malloc (curval->datasize);
          if (!curval->data)
-           return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                              "couldn't create device tree");
+           return grub_errno;
          grub_memcpy (curval->data, table_aliases[j].name, curval->datasize);
        }
     }
@@ -409,8 +407,7 @@
   curval->datasize = SIZEOF_OF_UINTN;
   curval->data = grub_malloc (curval->datasize);
   if (! curval->data)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                      "couldn't create device tree");
+    return grub_errno;
   if (SIZEOF_OF_UINTN == 4)
     *((grub_uint32_t *) curval->data)
       = PTR_TO_UINT32 (SYSTEM_TABLE_PTR (runtime_services));