From c779226e6cdc6ca54f10b07d7fef6b52142a5802 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 3 Feb 2012 12:47:07 +0100 Subject: [PATCH] * 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. --- ChangeLog | 10 ++++++++++ grub-core/loader/i386/xnu.c | 2 +- grub-core/video/radeon_fuloong2e.c | 2 +- grub-core/video/sis315pro.c | 2 +- grub-core/video/video.c | 3 +-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91197d67e..f6ac5b2b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-02-03 Vladimir Serbinenko + + * 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 NetBSD disk wedge support. diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c index 250e1b2e3..806bbacef 100644 --- 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 3a65b6720..0d78267bc 100644 --- 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 22064c91e..c8e63a5a4 100644 --- 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 ad87a69ff..77c5206e3 100644 --- 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