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

2007-05-17 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* video/i386/pc/vbe.c (grub_video_vbe_create_render_target): Add
	__attribute_ ((unused)) to mode_type argument.

	* util/getroot.c (grub_guess_root_device): Fix #endif.

	* kern/misc.c (memcmp): Fix prototype.

	* include/grub/partition.h [GRUB_UTIL]
	(grub_gpt_partition_map_init): Add prototype.
	(grub_gpt_partition_map_fini): Likewise.

	* fs/jfs.c (struct grub_jfs_inode): Put __attribute__ ((packed)
	at the right place.

	* fs/fat.c (grub_fat_mount): Replace ~0UL with ~0U.
	(grub_fat_read_data): Likewise.
	(grub_fat_find_dir): Likewise.

	* font/manager.c (find_glyph): Make table a const.
	(grub_font_get_glyph): Remove bitmap from if statement.
This commit is contained in:
jeroen 2007-05-17 15:43:32 +00:00
parent 849d55d3d1
commit 21c8cbb1ab
8 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
font/manager.c
View file

@ -1,6 +1,6 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003,2005,2006 Free Software Foundation, Inc.
* Copyright (C) 2003,2005,2006,2007 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -127,7 +127,7 @@ find_glyph (const struct font *font, grub_uint32_t code)
{
grub_uint32_t start = 0;
grub_uint32_t end = font->num - 1;
struct entry *table = font->table;
const struct entry *table = font->table;
/* This shouldn't happen. */
if (font->num == 0)
@ -206,9 +206,8 @@ grub_font_get_glyph (grub_uint32_t code,
goto restart;
}
if (bitmap
&& (grub_file_read (font->file, (char *) bitmap, w * 16)
!= (grub_ssize_t) w * 16))
if (grub_file_read (font->file, (char *) bitmap, w * 16)
!= (grub_ssize_t) w * 16)
{
remove_font (font);
goto restart;