summaryrefslogtreecommitdiff
path: root/lib/blkid
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2006-05-30 16:29:49 +0200
committerMatthias Andree <matthias.andree@gmx.de>2006-05-30 16:29:49 +0200
commitaadac9b7bbe7d1f4f0db02f3d7dbd70a856f9153 (patch)
treea6274095d00596b598fb596ff1fbc02ca430f7a2 /lib/blkid
parent9e0cbba89b3a7ba9d91d00c163de78a318517504 (diff)
downloade2fsprogs-aadac9b7bbe7d1f4f0db02f3d7dbd70a856f9153.tar.gz
Add parentheses and casts to make GCC happy.
Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
Diffstat (limited to 'lib/blkid')
-rw-r--r--lib/blkid/probe.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index 7beef9de..33f15a94 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -261,17 +261,17 @@ static int probe_fat(struct blkid_probe *probe,
__u32 buf_size, start_data_sect, next, root_start, root_dir_entries;
/* sector size check */
- tmp = &ms->ms_sector_size;
- sector_size = tmp[0] + tmp[1] << 8;
+ tmp = (unsigned char *)&ms->ms_sector_size;
+ sector_size = tmp[0] + (tmp[1] << 8);
if (sector_size != 0x200 && sector_size != 0x400 &&
sector_size != 0x800 && sector_size != 0x1000)
return 1;
- tmp = &ms->ms_dir_entries;
- dir_entries = tmp[0] + tmp[1] << 8;
+ tmp = (unsigned char *)&ms->ms_dir_entries;
+ dir_entries = tmp[0] + (tmp[1] << 8);
reserved = blkid_le16(ms->ms_reserved);
- tmp = &ms->ms_sectors;
- sect_count = tmp[0] + tmp[1] << 8;
+ tmp = (unsigned char *)&ms->ms_sectors;
+ sect_count = tmp[0] + (tmp[1] << 8);
if (sect_count == 0)
sect_count = blkid_le32(ms->ms_total_sect);