mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-28 01:59:49 +00:00
2009-05-13 Pavel Roskin <proski@gnu.org>
* kernel/disk.c (grub_disk_read): Use void pointer for the buffer. (grub_disk_write): Use const void pointer for the buffer. Adjust all callers. Remove unnecessary casts.
This commit is contained in:
1 parent
901d2f0c27
commit
238e871fff
29 files changed
+93
-86
No files matched your search
@@ -235,7 +235,7 @@ grub_ufs_get_file_block (struct grub_ufs_data *data, unsigned int blk)
|
||||
{
|
||||
grub_uint32_t indir[UFS_BLKSZ (sblock) >> 2];
|
||||
grub_disk_read (data->disk, INODE_INDIRBLOCKS (data, 0) << log2_blksz,
|
||||
0, sizeof (indir), (char *) indir);
|
||||
0, sizeof (indir), indir);
|
||||
return (data->ufs_type == UFS1) ? indir[blk] : indir[blk << 1];
|
||||
}
|
||||
blk -= indirsz;
|
||||
@@ -246,12 +246,12 @@ grub_ufs_get_file_block (struct grub_ufs_data *data, unsigned int blk)
|
||||
grub_uint32_t indir[UFS_BLKSZ (sblock) >> 2];
|
||||
|
||||
grub_disk_read (data->disk, INODE_INDIRBLOCKS (data, 1) << log2_blksz,
|
||||
0, sizeof (indir), (char *) indir);
|
||||
0, sizeof (indir), indir);
|
||||
grub_disk_read (data->disk,
|
||||
((data->ufs_type == UFS1) ?
|
||||
indir[blk / indirsz] : indir [(blk / indirsz) << 1])
|
||||
<< log2_blksz,
|
||||
0, sizeof (indir), (char *) indir);
|
||||
0, sizeof (indir), indir);
|
||||
|
||||
return (data->ufs_type == UFS1) ?
|
||||
indir[blk % indirsz] : indir[(blk % indirsz) << 1];
|
||||
@@ -362,7 +362,7 @@ grub_ufs_read_inode (struct grub_ufs_data *data, int ino, char *inode)
|
||||
+ grpino / 4,
|
||||
(grpino % 4) * sizeof (struct grub_ufs_inode),
|
||||
sizeof (struct grub_ufs_inode),
|
||||
(char *) inode);
|
||||
inode);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -378,7 +378,7 @@ grub_ufs_read_inode (struct grub_ufs_data *data, int ino, char *inode)
|
||||
+ grpino / 2,
|
||||
(grpino % 2) * sizeof (struct grub_ufs2_inode),
|
||||
sizeof (struct grub_ufs2_inode),
|
||||
(char *) inode);
|
||||
inode);
|
||||
}
|
||||
|
||||
return grub_errno;
|
||||
@@ -532,7 +532,7 @@ grub_ufs_mount (grub_disk_t disk)
|
||||
while (*sblklist != -1)
|
||||
{
|
||||
grub_disk_read (disk, *sblklist, 0, sizeof (struct grub_ufs_sblock),
|
||||
(char *) &data->sblock);
|
||||
&data->sblock);
|
||||
if (grub_errno)
|
||||
goto fail;
|
||||
|
||||
|
||||
Reference in new issue
Block a user