2007-05-17 Jeroen Dekkers <jeroen@dekkers.cx>
* 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:
parent
849d55d3d1
commit
21c8cbb1ab
8 changed files with 42 additions and 18 deletions
10
fs/fat.c
10
fs/fat.c
|
@ -1,7 +1,7 @@
|
|||
/* fat.c - FAT filesystem */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2000,2001,2002,2003,2004,2005,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
|
||||
|
@ -243,7 +243,7 @@ grub_fat_mount (grub_disk_t disk)
|
|||
else
|
||||
{
|
||||
/* FAT12 or FAT16. */
|
||||
data->root_cluster = ~0UL;
|
||||
data->root_cluster = ~0U;
|
||||
|
||||
if (data->num_clusters <= 4085 + 2)
|
||||
{
|
||||
|
@ -297,7 +297,7 @@ grub_fat_mount (grub_disk_t disk)
|
|||
|
||||
/* Start from the root directory. */
|
||||
data->file_cluster = data->root_cluster;
|
||||
data->cur_cluster_num = ~0UL;
|
||||
data->cur_cluster_num = ~0U;
|
||||
data->attr = GRUB_FAT_ATTR_DIRECTORY;
|
||||
return data;
|
||||
|
||||
|
@ -322,7 +322,7 @@ grub_fat_read_data (grub_disk_t disk, struct grub_fat_data *data,
|
|||
|
||||
/* This is a special case. FAT12 and FAT16 doesn't have the root directory
|
||||
in clusters. */
|
||||
if (data->file_cluster == ~0UL)
|
||||
if (data->file_cluster == ~0U)
|
||||
{
|
||||
size = (data->num_root_sectors << GRUB_DISK_SECTOR_BITS) - offset;
|
||||
if (size > len)
|
||||
|
@ -618,7 +618,7 @@ grub_fat_find_dir (grub_disk_t disk, struct grub_fat_data *data,
|
|||
data->file_size = grub_le_to_cpu32 (dir.file_size);
|
||||
data->file_cluster = ((grub_le_to_cpu16 (dir.first_cluster_high) << 16)
|
||||
| grub_le_to_cpu16 (dir.first_cluster_low));
|
||||
data->cur_cluster_num = ~0UL;
|
||||
data->cur_cluster_num = ~0U;
|
||||
|
||||
return dirp;
|
||||
}
|
||||
|
|
4
fs/jfs.c
4
fs/jfs.c
|
@ -166,11 +166,11 @@ struct grub_jfs_inode
|
|||
union
|
||||
{
|
||||
/* The tree describing the extents of the file. */
|
||||
struct
|
||||
struct __attribute__ ((packed))
|
||||
{
|
||||
struct grub_jfs_treehead tree;
|
||||
struct grub_jfs_tree_extent extents[16];
|
||||
} file __attribute__ ((packed));
|
||||
} file;
|
||||
union
|
||||
{
|
||||
/* The tree describing the dirents. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue