2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>

	* loader/i386/pc/xnu.c (grub_xnu_set_video): Add const qualifier to
	modevar.
	Return grub_errno on allocation error.

diff --git a/ChangeLog b/ChangeLog
index c0c15024e5ddde60508f1016f4358ef29d2bc6fb..6da2240940e27c6439d8bac83491c814d1c528f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * loader/i386/pc/xnu.c (grub_xnu_set_video): Add const qualifier to
+       modevar.
+       Return grub_errno on allocation error.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.

diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
index 57937946baa38c6cf9db82f8ac211aa767471bab..39a595d9b78598d62865d56fdf36fde299f0d372 100644 (file)
--- a/loader/i386/pc/xnu.c
+++ b/loader/i386/pc/xnu.c
@@ -35,7 +35,8 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
 {
   struct grub_video_mode_info mode_info;
   int ret;
-  char *tmp, *modevar;
+  char *tmp;
+  const char *modevar;
   void *framebuffer;
   grub_err_t err;
   struct grub_video_bitmap *bitmap = NULL;
@@ -51,8 +52,7 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
     {
       tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
       if (! tmp)
-       return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                          "couldn't allocate temporary storag");
+       return grub_errno;
       err = grub_video_set_mode (tmp,
                                 GRUB_VIDEO_MODE_TYPE_PURE_TEXT
                                 | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,