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

* grub-core/term/arc/console.c: Add missing cast to silence warning.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-24 05:04:12 +01:00
parent 6f2e82be3a
commit 971dbee521
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-11-24 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/arc/console.c: Add missing cast to silence warning.
2013-11-24 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-24 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/boot/i386/pc/boot.S: Fix floppy probe. Due to missing * grub-core/boot/i386/pc/boot.S: Fix floppy probe. Due to missing

8
grub-core/term/arc/console.c
View file

@ -114,8 +114,8 @@ check_is_serial (void)
isn't critical. isn't critical.
*/ */
if (GRUB_ARC_SYSTEM_PARAMETER_BLOCK->firmware_vector_length if (GRUB_ARC_SYSTEM_PARAMETER_BLOCK->firmware_vector_length
>= ((char *) (&GRUB_ARC_FIRMWARE_VECTOR->getenvironmentvariable + 1) >= (unsigned) ((char *) (&GRUB_ARC_FIRMWARE_VECTOR->getenvironmentvariable + 1)
- (char *) GRUB_ARC_FIRMWARE_VECTOR) - (char *) GRUB_ARC_FIRMWARE_VECTOR)
&& GRUB_ARC_FIRMWARE_VECTOR->getenvironmentvariable) && GRUB_ARC_FIRMWARE_VECTOR->getenvironmentvariable)
consout = GRUB_ARC_FIRMWARE_VECTOR->getenvironmentvariable ("ConsoleOut"); consout = GRUB_ARC_FIRMWARE_VECTOR->getenvironmentvariable ("ConsoleOut");
if (!consout) if (!consout)
@ -136,8 +136,8 @@ set_console_dimensions (void)
} }
if (GRUB_ARC_SYSTEM_PARAMETER_BLOCK->firmware_vector_length if (GRUB_ARC_SYSTEM_PARAMETER_BLOCK->firmware_vector_length
>= ((char *) (&GRUB_ARC_FIRMWARE_VECTOR->getdisplaystatus + 1) >= (unsigned) ((char *) (&GRUB_ARC_FIRMWARE_VECTOR->getdisplaystatus + 1)
- (char *) GRUB_ARC_FIRMWARE_VECTOR) - (char *) GRUB_ARC_FIRMWARE_VECTOR)
&& GRUB_ARC_FIRMWARE_VECTOR->getdisplaystatus) && GRUB_ARC_FIRMWARE_VECTOR->getdisplaystatus)
info = GRUB_ARC_FIRMWARE_VECTOR->getdisplaystatus (GRUB_ARC_STDOUT); info = GRUB_ARC_FIRMWARE_VECTOR->getdisplaystatus (GRUB_ARC_STDOUT);
if (info) if (info)