vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-03 12:47:07 +01:00
parent dc87d45a7a
commit c779226e6c
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -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> 2012-02-03 Grégoire Sutre <gregoire.sutre@gmail.com>
NetBSD disk wedge support. NetBSD disk wedge support.

2
grub-core/loader/i386/xnu.c
View file

@ -539,7 +539,7 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
file = grub_file_open (args[0]); file = grub_file_open (args[0]);
if (! file) if (! file)
return grub_error (GRUB_ERR_FILE_NOT_FOUND, 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); size = grub_file_size (file);
buf = grub_malloc (size); buf = grub_malloc (size);
if (!buf) if (!buf)

2
grub-core/video/radeon_fuloong2e.c
View file

@ -98,7 +98,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height,
if ((width != 640 && width != 0) || (height != 480 && height != 0) if ((width != 640 && width != 0) || (height != 480 && height != 0)
|| (depth != 16 && depth != 0)) || (depth != 16 && depth != 0))
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"Only 1024x600x16 is supported"); "Only 640x480x16 is supported");
grub_pci_iterate (find_card); grub_pci_iterate (find_card);
if (!found) if (!found)

2
grub-core/video/sis315pro.c
View file

@ -128,7 +128,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,
if ((width != 640 && width != 0) || (height != 480 && height != 0) if ((width != 640 && width != 0) || (height != 480 && height != 0)
|| (depth != 8 && depth != 0)) || (depth != 8 && depth != 0))
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"Only 640x400x8 is supported"); "Only 640x480x8 is supported");
grub_pci_iterate (find_card); grub_pci_iterate (find_card);
if (!found) if (!found)

3
grub-core/video/video.c
View file

@ -503,8 +503,7 @@ grub_video_set_mode (const char *modestring,
next_mode = modevar; next_mode = modevar;
if (! modevar) if (! modevar)
return grub_error (GRUB_ERR_OUT_OF_MEMORY, return grub_errno;
"couldn't allocate space for local modevar copy");
if (grub_memcmp (next_mode, "keep", sizeof ("keep")) == 0 if (grub_memcmp (next_mode, "keep", sizeof ("keep")) == 0
|| grub_memcmp (next_mode, "keep,", sizeof ("keep,") - 1) == 0 || grub_memcmp (next_mode, "keep,", sizeof ("keep,") - 1) == 0