diff options
author | Theodore Ts'o <tytso@mit.edu> | 2021-02-07 23:27:56 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2021-02-07 23:27:56 -0500 |
commit | d9844883a1148d58844a345abbd35b63321d9eeb (patch) | |
tree | b01cc2b2f3ea2974681960e67362515fc15bb8d5 | |
parent | 9f4e9fbbe23b54ccac7412f593704d5948e2007d (diff) | |
download | e2fsprogs-d9844883a1148d58844a345abbd35b63321d9eeb.tar.gz |
libext2fs: fix more compiler warnings
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r-- | lib/ext2fs/ext2fs.h | 15 | ||||
-rw-r--r-- | lib/ext2fs/link.c | 8 | ||||
-rw-r--r-- | lib/ext2fs/rw_bitmaps.c | 1 | ||||
-rw-r--r-- | lib/ext2fs/swapfs.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 6a26abc4c..df150f000 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -852,10 +852,6 @@ extern void ext2fs_free_block_bitmap(ext2fs_block_bitmap bitmap); extern void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap); extern errcode_t ext2fs_copy_bitmap(ext2fs_generic_bitmap src, ext2fs_generic_bitmap *dest); -extern errcode_t ext2fs_write_inode_bitmap(ext2_filsys fs); -extern errcode_t ext2fs_write_block_bitmap (ext2_filsys fs); -extern errcode_t ext2fs_read_inode_bitmap (ext2_filsys fs); -extern errcode_t ext2fs_read_block_bitmap(ext2_filsys fs); extern errcode_t ext2fs_allocate_block_bitmap(ext2_filsys fs, const char *descr, ext2fs_block_bitmap *ret); @@ -874,8 +870,6 @@ extern errcode_t ext2fs_fudge_block_bitmap_end2(ext2fs_block_bitmap bitmap, blk64_t end, blk64_t *oend); extern void ext2fs_clear_inode_bitmap(ext2fs_inode_bitmap bitmap); extern void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap); -extern errcode_t ext2fs_read_bitmaps(ext2_filsys fs); -extern errcode_t ext2fs_write_bitmaps(ext2_filsys fs); extern errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end, ext2fs_inode_bitmap bmap); extern errcode_t ext2fs_resize_inode_bitmap2(__u64 new_end, @@ -1743,6 +1737,15 @@ extern errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f, /* res_gdt.c */ extern errcode_t ext2fs_create_resize_inode(ext2_filsys fs); +/* rw_bitmaps.c */ +extern errcode_t ext2fs_rw_bitmaps(ext2_filsys fs, int flags, int num_threads); +extern errcode_t ext2fs_read_bitmaps(ext2_filsys fs); +extern errcode_t ext2fs_read_inode_bitmap (ext2_filsys fs); +extern errcode_t ext2fs_read_block_bitmap(ext2_filsys fs); +extern errcode_t ext2fs_write_bitmaps(ext2_filsys fs); +extern errcode_t ext2fs_write_inode_bitmap(ext2_filsys fs); +extern errcode_t ext2fs_write_block_bitmap (ext2_filsys fs); + /*sha256.c */ #define EXT2FS_SHA256_LENGTH 32 #if 0 diff --git a/lib/ext2fs/link.c b/lib/ext2fs/link.c index 4160ac65d..a2c34ac51 100644 --- a/lib/ext2fs/link.c +++ b/lib/ext2fs/link.c @@ -46,7 +46,6 @@ static errcode_t alloc_dx_frame(ext2_filsys fs, struct dx_frame *frame) static void dx_release(struct dx_lookup_info *info) { - struct ext2_dx_root_info *root; int level; for (level = 0; level < info->levels; level++) { @@ -98,7 +97,7 @@ static errcode_t dx_lookup(ext2_filsys fs, ext2_ino_t dir, int count, limit; int hash_alg; int hash_flags = diri->i_flags & EXT4_CASEFOLD_FL; - __u32 hash, minor_hash; + __u32 minor_hash; struct dx_frame *frame; errcode = alloc_dx_frame(fs, &(info->frames[0])); @@ -193,7 +192,6 @@ static int link_proc(ext2_ino_t dir EXT2FS_ATTR((unused)), unsigned int rec_len, min_rec_len, curr_rec_len; int ret = 0; int csum_size = 0; - struct ext2_dir_entry_tail *t; if (ls->done) return DIRENT_ABORT; @@ -322,7 +320,7 @@ static errcode_t dx_move_dirents(ext2_filsys fs, struct dx_hash_map *map, { struct ext2_dir_entry *de; int i; - int rec_len; + int rec_len = 0; errcode_t retval; int csum_size = 0; void *base = to; @@ -382,7 +380,7 @@ static errcode_t dx_split_leaf(ext2_filsys fs, ext2_ino_t dir, void *buf2; errcode_t retval = 0; unsigned int rec_len; - int offset, move_size; + unsigned int offset, move_size; int i, count = 0; struct dx_hash_map *map; int continued; diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c index e3f6312ae..d760064c8 100644 --- a/lib/ext2fs/rw_bitmaps.c +++ b/lib/ext2fs/rw_bitmaps.c @@ -530,7 +530,6 @@ errcode_t ext2fs_rw_bitmaps(ext2_filsys fs, int flags, int num_threads) unsigned flexbg_size = 1 << fs->super->s_log_groups_per_flex; dgrp_t average_group; int i, tail_flags = 0; - io_manager manager = unix_io_manager; #endif if (flags & ~EXT2FS_BITMAPS_VALID_FLAGS) diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c index bc9f32300..1006b2d2b 100644 --- a/lib/ext2fs/swapfs.c +++ b/lib/ext2fs/swapfs.c @@ -245,7 +245,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, { unsigned i, extra_isize, attr_magic; int has_extents, has_inline_data, islnk, fast_symlink; - int inode_size; + unsigned int inode_size; __u32 *eaf, *eat; /* |