vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

libext2fs: Fix minor gcc -Wall warnings 

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
bitmap-optimize
Theodore Ts'o 2009-07-12 01:13:06 -04:00
parent 3c77b8ec54
commit 25c7e0c304
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ext2fs/dir_iterate.c
View File

@ -80,7 +80,7 @@ static int ext2fs_validate_entry(ext2_filsys fs, char *buf,
offset += rec_len; offset += rec_len;
if ((rec_len < 8) || if ((rec_len < 8) ||
((rec_len % 4) != 0) || ((rec_len % 4) != 0) ||
(((dirent->name_len & 0xFF)+8) > rec_len)) ((((unsigned) dirent->name_len & 0xFF)+8) > rec_len))
return 0; return 0;
} }
return (offset == final_offset); return (offset == final_offset);
@ -186,8 +186,8 @@ int ext2fs_process_dir_block(ext2_filsys fs,
int ret = 0; int ret = 0;
int changed = 0; int changed = 0;
int do_abort = 0; int do_abort = 0;
unsigned int rec_len; unsigned int rec_len, size;
int entry, size; int entry;
struct ext2_dir_entry *dirent; struct ext2_dir_entry *dirent;
if (blockcnt < 0) if (blockcnt < 0)
@ -206,7 +206,7 @@ int ext2fs_process_dir_block(ext2_filsys fs,
if (((offset + rec_len) > fs->blocksize) || if (((offset + rec_len) > fs->blocksize) ||
(rec_len < 8) || (rec_len < 8) ||
((rec_len % 4) != 0) || ((rec_len % 4) != 0) ||
(((dirent->name_len & 0xFF)+8) > rec_len)) { ((((unsigned) dirent->name_len & 0xFF)+8) > rec_len)) {
ctx->errcode = EXT2_ET_DIR_CORRUPTED; ctx->errcode = EXT2_ET_DIR_CORRUPTED;
return BLOCK_ABORT; return BLOCK_ABORT;
} }

1
lib/ext2fs/extent.c
View File

@ -1354,7 +1354,6 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags)
char *cp; char *cp;
struct ext3_extent_header *eh; struct ext3_extent_header *eh;
errcode_t retval = 0; errcode_t retval = 0;
struct ext2fs_extent extent;
EXT2_CHECK_MAGIC(handle, EXT2_ET_MAGIC_EXTENT_HANDLE); EXT2_CHECK_MAGIC(handle, EXT2_ET_MAGIC_EXTENT_HANDLE);

6
lib/ext2fs/gen_bitmap.c
View File

@ -355,7 +355,7 @@ static int ext2fs_test_clear_generic_bitmap_range(ext2fs_generic_bitmap bitmap,
unsigned int len) unsigned int len)
{ {
size_t start_byte, len_byte = len >> 3; size_t start_byte, len_byte = len >> 3;
int start_bit, len_bit = len % 8; unsigned int start_bit, len_bit = len % 8;
int first_bit = 0; int first_bit = 0;
int last_bit = 0; int last_bit = 0;
int mark_count = 0; int mark_count = 0;
@ -425,8 +425,6 @@ static int ext2fs_test_clear_generic_bitmap_range(ext2fs_generic_bitmap bitmap,
int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap, int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
blk_t block, int num) blk_t block, int num)
{ {
int i;
EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_BLOCK_BITMAP); EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
if ((block < bitmap->start) || (block+num-1 > bitmap->real_end)) { if ((block < bitmap->start) || (block+num-1 > bitmap->real_end)) {
ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
@ -440,8 +438,6 @@ int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
int ext2fs_test_inode_bitmap_range(ext2fs_inode_bitmap bitmap, int ext2fs_test_inode_bitmap_range(ext2fs_inode_bitmap bitmap,
ino_t inode, int num) ino_t inode, int num)
{ {
int i;
EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_INODE_BITMAP); EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_INODE_BITMAP);
if ((inode < bitmap->start) || (inode+num-1 > bitmap->real_end)) { if ((inode < bitmap->start) || (inode+num-1 > bitmap->real_end)) {
ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST, ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST,