* grub-core/loader/i386/xnu.c (grub_cmd_devprop_load): Fix error

	message.
	* grub-core/video/radeon_fuloong2e.c
	(grub_video_radeon_fuloong2e_setup): Likewise.
	* grub-core/video/sis315pro.c (grub_video_sis315pro_setup): Likewise.
	* grub-core/video/video.c (grub_video_set_mode): Don't override
	standard out of memory message.

diff --git a/ChangeLog b/ChangeLog
index 91197d67e5ebcbb3930356b6e081ad7c439c9bc7..f6ac5b2b069983d9d65c5fbf5c513907eba34a24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/xnu.c (grub_cmd_devprop_load): Fix error
+       message.
+       * grub-core/video/radeon_fuloong2e.c
+       (grub_video_radeon_fuloong2e_setup): Likewise.
+       * grub-core/video/sis315pro.c (grub_video_sis315pro_setup): Likewise.
+       * grub-core/video/video.c (grub_video_set_mode): Don't override
+       standard out of memory message.
+
 2012-02-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
        NetBSD disk wedge support.

diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index 250e1b2e33515ad5f1b8e2423fb4259ed7a8b30d..806bbacefcbc3848bd3b3629515d4c4a324ae3cf 100644 (file)
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -539,7 +539,7 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
   file = grub_file_open (args[0]);
   if (! file)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
-                      "couldn't load device-propertie dump");
+                      "couldn't load device-properties dump");
   size = grub_file_size (file);
   buf = grub_malloc (size);
   if (!buf)

diff --git a/grub-core/video/radeon_fuloong2e.c b/grub-core/video/radeon_fuloong2e.c
index 3a65b67207d16c0f73b51e22b91eab95e8b80c1e..0d78267bc33218b68e5f209d30584a33403796aa 100644 (file)
--- a/grub-core/video/radeon_fuloong2e.c
+++ b/grub-core/video/radeon_fuloong2e.c
@@ -98,7 +98,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height,
   if ((width != 640 && width != 0) || (height != 480 && height != 0)
       || (depth != 16 && depth != 0))
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-                      "Only 1024x600x16 is supported");
+                      "Only 640x480x16 is supported");
 
   grub_pci_iterate (find_card);
   if (!found)

diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c
index 22064c91e9986d1a883c391de91ec0ac92bacfa1..c8e63a5a4f9d8360bc8a081b03313e261b3f2ea4 100644 (file)
--- a/grub-core/video/sis315pro.c
+++ b/grub-core/video/sis315pro.c
@@ -128,7 +128,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
   if ((width != 640 && width != 0) || (height != 480 && height != 0)
       || (depth != 8 && depth != 0))
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-                      "Only 640x400x8 is supported");
+                      "Only 640x480x8 is supported");
 
   grub_pci_iterate (find_card);
   if (!found)

diff --git a/grub-core/video/video.c b/grub-core/video/video.c
index ad87a69ffd19fc580c9a1cb36ffe25a4c000c167..77c5206e31390bd2455b93254575e540bce4870b 100644 (file)
--- a/grub-core/video/video.c
+++ b/grub-core/video/video.c
@@ -503,8 +503,7 @@ grub_video_set_mode (const char *modestring,
   next_mode = modevar;
 
   if (! modevar)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-                      "couldn't allocate space for local modevar copy");
+    return grub_errno;
 
   if (grub_memcmp (next_mode, "keep", sizeof ("keep")) == 0
       || grub_memcmp (next_mode, "keep,", sizeof ("keep,") - 1) == 0