i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fat: Fix compiler warnings.

Browse Source
This commit is contained in:
Michael Lotz
2015-05-02 15:49:55 +02:00
parent 09592b1dcc
commit 52bf63bbbb
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/fat/dosfs.c
+7 -8
View File
@@ -711,9 +711,7 @@ dosfs_identify_partition(int fd, partition_data *partition, void **_cookie)
uint8 buf[512]; uint8 buf[512];
int i; int i;
uint32 bytes_per_sector; uint32 bytes_per_sector;
uint32 sectors_per_cluster;
uint32 fatCount; uint32 fatCount;
uint32 reserved_sectors;
uint32 total_sectors; uint32 total_sectors;
uint32 sectors_per_fat; uint32 sectors_per_fat;
char name[12]; char name[12];
@@ -738,13 +736,11 @@ dosfs_identify_partition(int fd, partition_data *partition, void **_cookie)
} }
// must be a power of two // must be a power of two
sectors_per_cluster = i = buf[0xd]; i = buf[0xd];
if (i != 1 && i != 2 && i != 4 && i != 8 && i != 0x10 && i != 0x20 if (i != 1 && i != 2 && i != 4 && i != 8 && i != 0x10 && i != 0x20
&& i != 0x40 && i != 0x80) && i != 0x40 && i != 0x80)
return -1; return -1;
reserved_sectors = read16(buf, 0xe);
fatCount = buf[0x10]; fatCount = buf[0x10];
if (fatCount == 0 || fatCount > 8) if (fatCount == 0 || fatCount > 8)
return -1; return -1;
@@ -1101,9 +1097,11 @@ dosfs_write_fs_stat(fs_volume *_vol, const struct fs_info * fss, uint32 mask)
goto bi; goto bi;
} }
if ((vol->sectors_per_fat == 0 && (buffer[0x42] != 0x29 if ((vol->sectors_per_fat == 0 && (buffer[0x42] != 0x29
|| strncmp(buffer + 0x47, vol->vol_label, 11) != 0)) || strncmp((const char *)buffer + 0x47, vol->vol_label, 11)
!= 0))
|| (vol->sectors_per_fat != 0 && (buffer[0x26] != 0x29 || (vol->sectors_per_fat != 0 && (buffer[0x26] != 0x29
|| strncmp(buffer + 0x2b, vol->vol_label, 11) == 0))) { || strncmp((const char *)buffer + 0x2b, vol->vol_label, 11)
== 0))) {
dprintf("dosfs_wfsstat: label mismatch\n"); dprintf("dosfs_wfsstat: label mismatch\n");
block_cache_set_dirty(vol->fBlockCache, 0, false, -1); block_cache_set_dirty(vol->fBlockCache, 0, false, -1);
result = B_ERROR; result = B_ERROR;
@@ -1118,7 +1116,8 @@ dosfs_write_fs_stat(fs_volume *_vol, const struct fs_info * fss, uint32 mask)
buffer = diri_init(vol, vol->root_vnode.cluster, vol->vol_entry, &diri); buffer = diri_init(vol, vol->root_vnode.cluster, vol->vol_entry, &diri);
// check if it is the same as the old volume label // check if it is the same as the old volume label
if ((buffer == NULL) || (strncmp(buffer, vol->vol_label, 11) == 0)) { if (buffer == NULL || strncmp((const char *)buffer, vol->vol_label,
11) == 0) {
dprintf("dosfs_wfsstat: label mismatch\n"); dprintf("dosfs_wfsstat: label mismatch\n");
diri_free(&diri); diri_free(&diri);
result = B_ERROR; result = B_ERROR;
src/add-ons/kernel/file_systems/fat/iter.c
+2 -2
View File
@@ -150,7 +150,7 @@ csi_read_blocks(struct csi *csi, uint8 *buffer, ssize_t len)
uint32 sectors; uint32 sectors;
off_t block; off_t block;
status_t err; status_t err;
char *buf = buffer; uint8 *buf = buffer;
int32 i; int32 i;
ASSERT(len >= csi->vol->bytes_per_sector); ASSERT(len >= csi->vol->bytes_per_sector);
@@ -191,7 +191,7 @@ csi_write_blocks(struct csi *csi, uint8 *buffer, ssize_t len)
uint32 sectors; uint32 sectors;
off_t block; off_t block;
status_t err; status_t err;
char *buf = buffer; uint8 *buf = buffer;
int32 i; int32 i;
ASSERT(len >= csi->vol->bytes_per_sector); ASSERT(len >= csi->vol->bytes_per_sector);