2009-01-27 Vesa Jääskeläinen <chaac@nic.fi>

* disk/scsi.c (grub_scsi_read): Fix sign problem.

	* term/i386/pc/vga_text.c (grub_vga_text_init_fini). Fix declaration.

	* util/grub-mkfont.c (usage): Fix typo.

	* util/elf/grub-mkimage.c (load_modules): Fix warning.
This commit is contained in:
chaac 2009-01-27 18:26:09 +00:00
parent 3fb18f094d
commit 6a7eab2c13
5 changed files with 24 additions and 12 deletions

View file

@ -1,3 +1,13 @@
2009-01-27 Vesa Jääskeläinen <chaac@nic.fi>
* disk/scsi.c (grub_scsi_read): Fix sign problem.
* term/i386/pc/vga_text.c (grub_vga_text_init_fini). Fix declaration.
* util/grub-mkfont.c (usage): Fix typo.
* util/elf/grub-mkimage.c (load_modules): Fix warning.
2009-01-26 Daniel Mierswa <impulze@impulze.org> 2009-01-26 Daniel Mierswa <impulze@impulze.org>
* fs/fat.c (grub_fat_uuid): Fix shift of the first two bytes. * fs/fat.c (grub_fat_uuid): Fix shift of the first two bytes.

View file

@ -332,7 +332,7 @@ grub_scsi_read (grub_disk_t disk, grub_disk_addr_t sector,
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"Unsupported SCSI block size"); "Unsupported SCSI block size");
grub_int32_t sector_mod = 0; grub_uint32_t sector_mod = 0;
sector = grub_divmod64 (sector, spb, &sector_mod); sector = grub_divmod64 (sector, spb, &sector_mod);
if (! (sector_mod == 0 && size % spb == 0)) if (! (sector_mod == 0 && size % spb == 0))

View file

@ -143,7 +143,7 @@ grub_vga_text_setcursor (int on)
} }
static grub_err_t static grub_err_t
grub_vga_text_init_fini () grub_vga_text_init_fini (void)
{ {
grub_vga_text_cls (); grub_vga_text_cls ();
return 0; return 0;

View file

@ -103,7 +103,9 @@ load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
struct grub_util_path_list *path_list; struct grub_util_path_list *path_list;
struct grub_util_path_list *p; struct grub_util_path_list *p;
struct grub_module_info *modinfo; struct grub_module_info *modinfo;
size_t offset, total_module_size, memdisk_size; size_t offset;
size_t total_module_size;
size_t memdisk_size = 0;
path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods); path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);

View file

@ -102,7 +102,7 @@ Usage: grub-mkfont [OPTIONS] FONT_FILES\n\
-s, --size=N set font size\n\ -s, --size=N set font size\n\
-d, --desc=N set font descent\n\ -d, --desc=N set font descent\n\
-b, --bold convert to bold font\n\ -b, --bold convert to bold font\n\
-a, --force-autohine force autohint\n\ -a, --force-autohint force autohint\n\
--no-hinting disable hinting\n\ --no-hinting disable hinting\n\
--no-bitmap ignore bitmap strikes when loading\n\ --no-bitmap ignore bitmap strikes when loading\n\
-h, --help display this message and exit\n\ -h, --help display this message and exit\n\