libext2fs: fix gcc -Wall nits

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

8 files changed, 60 insertions, 51 deletions

diff --git a/lib/ext2fs/dir_iterate.c b/lib/ext2fs/dir_iterate.c
index 9063c173..390573a6 100644
--- a/lib/ext2fs/dir_iterate.c
+++ b/lib/ext2fs/dir_iterate.c
@@ -83,7 +83,7 @@ static int ext2fs_validate_entry(ext2_filsys fs, char *buf,
 		offset += rec_len;
 		if ((rec_len < 8) ||
 		    ((rec_len % 4) != 0) ||
-		    ((ext2fs_dirent_name_len(dirent)+8) > rec_len))
+		    ((ext2fs_dirent_name_len(dirent)+8) > (int) rec_len))
 			return 0;
 	}
 	return (offset == final_offset);
@@ -229,7 +229,7 @@ int ext2fs_process_dir_block(ext2_filsys fs,
 		if (((offset + rec_len) > buflen) ||
 		    (rec_len < 8) ||
 		    ((rec_len % 4) != 0) ||
-		    ((ext2fs_dirent_name_len(dirent)+8) > rec_len)) {
+		    ((ext2fs_dirent_name_len(dirent)+8) > (int) rec_len)) {
 			ctx->errcode = EXT2_ET_DIR_CORRUPTED;
 			return BLOCK_ABORT;
 		}
diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c
index f8fe6915..bb950aa8 100644
--- a/lib/ext2fs/ext_attr.c
+++ b/lib/ext2fs/ext_attr.c
@@ -281,7 +281,7 @@ static const char *find_ea_prefix(int index)
 	return NULL;
 }
 
-static int find_ea_index(const char *fullname, char **name, int *index)
+static int find_ea_index(char *fullname, char **name, int *index)
 {
 	struct ea_name_index *e;
 
@@ -439,7 +439,7 @@ static errcode_t write_xattrs_to_buffer(struct ext2_xattr_handle *handle,
 {
 	struct ext2_xattr *x = *pos;
 	struct ext2_ext_attr_entry *e = entries_start;
-	void *end = entries_start + storage_size;
+	char *end = (char *) entries_start + storage_size;
 	char *shortname;
 	unsigned int entry_size, value_size;
 	int idx, ret;
@@ -466,20 +466,20 @@ static errcode_t write_xattrs_to_buffer(struct ext2_xattr_handle *handle,
 		 * Note that we must leave sufficient room for a (u32)0 to
 		 * mark the end of the entries.
 		 */
-		if ((void *)e + entry_size + sizeof(__u32) > end - value_size)
+		if ((char *)e + entry_size + sizeof(__u32) > end - value_size)
 			break;
 
 		/* Fill out e appropriately */
 		e->e_name_len = strlen(shortname);
 		e->e_name_index = (ret ? idx : 0);
-		e->e_value_offs = end - value_size - (void *)entries_start +
+		e->e_value_offs = end - value_size - (char *)entries_start +
 				value_offset_correction;
 		e->e_value_block = 0;
 		e->e_value_size = x->value_len;
 
 		/* Store name and value */
 		end -= value_size;
-		memcpy((void *)e + sizeof(*e), shortname, e->e_name_len);
+		memcpy((char *)e + sizeof(*e), shortname, e->e_name_len);
 		memcpy(end, x->value, e->e_value_size);
 
 		if (write_hash)
@@ -499,7 +499,7 @@ errcode_t ext2fs_xattrs_write(struct ext2_xattr_handle *handle)
 {
 	struct ext2_xattr *x;
 	struct ext2_inode_large *inode;
-	void *start, *block_buf = NULL;
+	char *start, *block_buf = NULL;
 	struct ext2_ext_attr_header *header;
 	__u32 ea_inode_magic;
 	blk64_t blk;
@@ -576,7 +576,7 @@ write_ea_block:
 	start = block_buf + sizeof(struct ext2_ext_attr_header);
 
 	err = write_xattrs_to_buffer(handle, &x, start, storage_size,
-				     (void *)start - block_buf, 1);
+				     start - block_buf, 1);
 	if (err)
 		goto out2;
 
@@ -586,7 +586,7 @@ write_ea_block:
 	}
 
 	/* Write a header on the EA block */
-	header = block_buf;
+	header = (struct ext2_ext_attr_header *) block_buf;
 	header->h_magic = EXT2_EXT_ATTR_MAGIC;
 	header->h_refcount = 1;
 	header->h_blocks = 1;
@@ -631,7 +631,7 @@ out:
 static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle,
 					 struct ext2_ext_attr_entry *entries,
 					 unsigned int storage_size,
-					 void *value_start,
+					 char *value_start,
 					 size_t *nr_read)
 {
 	struct ext2_xattr *x;
@@ -640,7 +640,7 @@ static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle,
 	unsigned int remain, prefix_len;
 	errcode_t err;
 	unsigned int values_size = storage_size +
-			((char *)entries - (char *)value_start);
+			((char *)entries - value_start);
 
 	x = handle->attrs;
 	while (x->name)
@@ -685,7 +685,7 @@ static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle,
 
 		if (entry->e_value_size > 0 &&
 		    value_start + entry->e_value_offs <
-		    (void *)end + sizeof(__u32))
+		    (char *)end + sizeof(__u32))
 			return EXT2_ET_EA_BAD_VALUE_OFFSET;
 
 		/* e_value_block must be 0 in inode's ea */
@@ -720,7 +720,7 @@ static errcode_t read_xattrs_from_buffer(struct ext2_xattr_handle *handle,
 			memcpy(x->name, prefix, prefix_len);
 		if (entry->e_name_len)
 			memcpy(x->name + prefix_len,
-			       (void *)entry + sizeof(*entry),
+			       (char *)entry + sizeof(*entry),
 			       entry->e_name_len);
 
 		err = ext2fs_get_mem(entry->e_value_size, &x->value);
@@ -757,9 +757,9 @@ errcode_t ext2fs_xattrs_read(struct ext2_xattr_handle *handle)
 	struct ext2_ext_attr_header *header;
 	__u32 ea_inode_magic;
 	unsigned int storage_size;
-	void *start, *block_buf = NULL;
+	char *start, *block_buf = NULL;
 	blk64_t blk;
-	int i;
+	size_t i;
 	errcode_t err;
 
 	EXT2_CHECK_MAGIC(handle, EXT2_ET_MAGIC_EA_HANDLE);
@@ -795,7 +795,8 @@ errcode_t ext2fs_xattrs_read(struct ext2_xattr_handle *handle)
 		start = ((char *) inode) + EXT2_GOOD_OLD_INODE_SIZE +
 			inode->i_extra_isize + sizeof(__u32);
 
-		err = read_xattrs_from_buffer(handle, start, storage_size,
+		err = read_xattrs_from_buffer(handle,
+			(struct ext2_ext_attr_entry *) start, storage_size,
 					      start, &handle->count);
 		if (err)
 			goto out;
@@ -831,7 +832,8 @@ read_ea_block:
 		storage_size = handle->fs->blocksize -
 			sizeof(struct ext2_ext_attr_header);
 		start = block_buf + sizeof(struct ext2_ext_attr_header);
-		err = read_xattrs_from_buffer(handle, start, storage_size,
+		err = read_xattrs_from_buffer(handle,
+			(struct ext2_ext_attr_entry *) start, storage_size,
 					      block_buf, &handle->count);
 		if (err)
 			goto out3;
@@ -877,7 +879,7 @@ errcode_t ext2fs_xattr_get(struct ext2_xattr_handle *h, const char *key,
 			   void **value, size_t *value_len)
 {
 	struct ext2_xattr *x;
-	void *val;
+	char *val;
 	errcode_t err;
 
 	EXT2_CHECK_MAGIC(h, EXT2_ET_MAGIC_EA_HANDLE);
@@ -906,8 +908,8 @@ errcode_t ext2fs_xattr_inode_max_size(ext2_filsys fs, ext2_ino_t ino,
 	struct ext2_inode_large *inode;
 	__u32 ea_inode_magic;
 	unsigned int minoff;
-	void *start;
-	int i;
+	char *start;
+	size_t i;
 	errcode_t err;
 
 	i = EXT2_INODE_SIZE(fs->super);
@@ -937,7 +939,7 @@ errcode_t ext2fs_xattr_inode_max_size(ext2_filsys fs, ext2_ino_t ino,
 		/* has xattrs.  calculate the size */
 		start= ((char *) inode) + EXT2_GOOD_OLD_INODE_SIZE +
 			inode->i_extra_isize + sizeof(__u32);
-		entry = start;
+		entry = (struct ext2_ext_attr_entry *) start;
 		while (!EXT2_EXT_IS_LAST_ENTRY(entry)) {
 			if (!entry->e_value_block && entry->e_value_size) {
 				unsigned int offs = entry->e_value_offs;
diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
index 19f38fde..a9cdae79 100644
--- a/lib/ext2fs/extent.c
+++ b/lib/ext2fs/extent.c
@@ -1536,18 +1536,18 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
 		if (retval)
 			goto done;
 	} else {
-		__u32	orig_length;
-		blk64_t	orig_lblk;
-		struct ext2fs_extent orig_extent;
+		__u32	save_length;
+		blk64_t	save_lblk;
+		struct ext2fs_extent save_extent;
 		errcode_t r2;
 
 #ifdef DEBUG
 		printf("(re/un)mapping in middle of extent\n");
 #endif
 		/* need to split this extent; later */
-		orig_lblk = extent.e_lblk;
-		orig_length = extent.e_len;
-		orig_extent = extent;
+		save_lblk = extent.e_lblk;
+		save_length = extent.e_len;
+		save_extent = extent;
 
 		/* shorten pre-split extent */
 		extent.e_len = (logical - extent.e_lblk);
@@ -1560,17 +1560,17 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
 			retval = ext2fs_extent_insert(handle,
 					EXT2_EXTENT_INSERT_AFTER, &newextent);
 			if (retval) {
-				r2 = ext2fs_extent_goto(handle, orig_lblk);
+				r2 = ext2fs_extent_goto(handle, save_lblk);
 				if (r2 == 0)
 					(void)ext2fs_extent_replace(handle, 0,
-							      &orig_extent);
+							      &save_extent);
 				goto done;
 			}
 		}
 		/* add post-split extent */
 		extent.e_pblk += extent.e_len + 1;
 		extent.e_lblk += extent.e_len + 1;
-		extent.e_len = orig_length - extent.e_len - 1;
+		extent.e_len = save_length - extent.e_len - 1;
 		retval = ext2fs_extent_insert(handle,
 				EXT2_EXTENT_INSERT_AFTER, &extent);
 		if (retval) {
@@ -1580,10 +1580,10 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
 				if (r2 == 0)
 					(void)ext2fs_extent_delete(handle, 0);
 			}
-			r2 = ext2fs_extent_goto(handle, orig_lblk);
+			r2 = ext2fs_extent_goto(handle, save_lblk);
 			if (r2 == 0)
 				(void)ext2fs_extent_replace(handle, 0,
-							    &orig_extent);
+							    &save_extent);
 			goto done;
 		}
 	}
diff --git a/lib/ext2fs/fallocate.c b/lib/ext2fs/fallocate.c
index 5ae3125e..01c709a9 100644
--- a/lib/ext2fs/fallocate.c
+++ b/lib/ext2fs/fallocate.c
@@ -58,7 +58,8 @@
  * At the end, update i_blocks and i_size appropriately.
  */
 
-static void dbg_print_extent(char *desc, struct ext2fs_extent *extent)
+static void dbg_print_extent(const char *desc EXT2FS_ATTR((unused)),
+		const struct ext2fs_extent *extent EXT2FS_ATTR((unused)))
 {
 #ifdef DEBUG
 	if (desc)
diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c
index d0a05d67..810a7fd8 100644
--- a/lib/ext2fs/fileio.c
+++ b/lib/ext2fs/fileio.c
@@ -267,7 +267,7 @@ ext2fs_file_read_inline_data(ext2_file_t file, void *buf,
 		count = wanted;
 	memcpy(buf, file->buf + file->pos, count);
 	file->pos += count;
-	buf += count;
+	buf = (char *) buf + count;
 
 out:
 	if (got)
@@ -484,7 +484,7 @@ errcode_t ext2fs_file_llseek(ext2_file_t file, __u64 offset,
 errcode_t ext2fs_file_lseek(ext2_file_t file, ext2_off_t offset,
 			    int whence, ext2_off_t *ret_pos)
 {
-	__u64		loffset, ret_loffset;
+	__u64		loffset, ret_loffset = 0;
 	errcode_t	retval;
 
 	loffset = offset;
diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c
index 6260c5f3..3a81eb05 100644
--- a/lib/ext2fs/inline_data.c
+++ b/lib/ext2fs/inline_data.c
@@ -85,11 +85,12 @@ err:
 errcode_t ext2fs_inline_data_init(ext2_filsys fs, ext2_ino_t ino)
 {
 	struct ext2_inline_data data;
+	char empty[1] = { '\0' };
 
 	data.fs = fs;
 	data.ino = ino;
 	data.ea_size = 0;
-	data.ea_data = "";
+	data.ea_data = empty;
 	return ext2fs_inline_data_ea_set(&data);
 }
 
@@ -285,7 +286,8 @@ static errcode_t ext2fs_inline_data_convert_dir(ext2_filsys fs, ext2_ino_t ino,
 	struct ext2_dir_entry *dir, *dir2;
 	struct ext2_dir_entry_tail *t;
 	errcode_t retval;
-	unsigned int offset, rec_len;
+	int offset;
+	unsigned int rec_len;
 	int csum_size = 0;
 	int filetype = 0;
 
@@ -532,7 +534,7 @@ errcode_t ext2fs_inline_data_get(ext2_filsys fs, ext2_ino_t ino,
 
 	memcpy(buf, (void *)inode->i_block, EXT4_MIN_INLINE_DATA_SIZE);
 	if (data.ea_size > 0)
-		memcpy(buf + EXT4_MIN_INLINE_DATA_SIZE,
+		memcpy((char *) buf + EXT4_MIN_INLINE_DATA_SIZE,
 		       data.ea_data, data.ea_size);
 
 	if (size)
@@ -589,7 +591,7 @@ errcode_t ext2fs_inline_data_set(ext2_filsys fs, ext2_ino_t ino,
 	data.fs = fs;
 	data.ino = ino;
 	data.ea_size = size - EXT4_MIN_INLINE_DATA_SIZE;
-	data.ea_data = buf + EXT4_MIN_INLINE_DATA_SIZE;
+	data.ea_data = (char *) buf + EXT4_MIN_INLINE_DATA_SIZE;
 	return ext2fs_inline_data_ea_set(&data);
 }
 
diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index 58389a83..ba7ad2c9 100644
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -64,7 +64,7 @@ struct ext2_struct_inode_scan {
  */
 errcode_t ext2fs_flush_icache(ext2_filsys fs)
 {
-	int	i;
+	unsigned	i;
 
 	if (!fs->icache)
 		return 0;
@@ -81,7 +81,7 @@ errcode_t ext2fs_flush_icache(ext2_filsys fs)
  */
 void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
 {
-	int i;
+	unsigned i;
 
 	if (--icache->refcount)
 		return;
@@ -97,7 +97,7 @@ void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
 
 errcode_t ext2fs_create_inode_cache(ext2_filsys fs, unsigned int cache_size)
 {
-	int		i;
+	unsigned	i;
 	errcode_t	retval;
 
 	if (fs->icache)
@@ -410,7 +410,7 @@ static void check_inode_block_sanity(ext2_inode_scan scan, blk64_t num_blocks)
 	ext2_ino_t	ino, inodes_to_scan;
 	unsigned int	badness, checksum_failures;
 	unsigned int	inodes_in_buf, inodes_per_block;
-	void		*p;
+	char		*p;
 	struct ext2_inode_large *inode;
 	char		*block_status;
 	unsigned int	blk, bad_csum;
@@ -423,7 +423,7 @@ static void check_inode_block_sanity(ext2_inode_scan scan, blk64_t num_blocks)
 	if (inodes_to_scan > inodes_in_buf)
 		inodes_to_scan = inodes_in_buf;
 
-	p = scan->inode_buffer;
+	p = (char *) scan->inode_buffer;
 	ino = scan->current_inode + 1;
 	checksum_failures = badness = 0;
 	block_status = SCAN_BLOCK_STATUS(scan);
@@ -439,8 +439,9 @@ static void check_inode_block_sanity(ext2_inode_scan scan, blk64_t num_blocks)
 #endif
 
 	while (inodes_to_scan > 0) {
-		blk = (p - (void *)scan->inode_buffer) / scan->fs->blocksize;
-		bad_csum = ext2fs_inode_csum_verify(scan->fs, ino, p) == 0;
+		blk = (p - (char *)scan->inode_buffer) / scan->fs->blocksize;
+		bad_csum = ext2fs_inode_csum_verify(scan->fs, ino,
+				(struct ext2_inode_large *) p) == 0;
 
 #ifdef WORDS_BIGENDIAN
 		ext2fs_swap_inode_full(scan->fs,
@@ -448,7 +449,7 @@ static void check_inode_block_sanity(ext2_inode_scan scan, blk64_t num_blocks)
 			       (struct ext2_inode_large *) p,
 			       0, EXT2_INODE_SIZE(scan->fs->super));
 #else
-		inode = p;
+		inode = (struct ext2_inode_large *) p;
 #endif
 
 		/* Is this inode insane? */
@@ -733,7 +734,8 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
 	unsigned long 	group, block, offset;
 	char 		*ptr;
 	errcode_t	retval;
-	int		clen, i, inodes_per_block;
+	unsigned	i;
+	int		clen, inodes_per_block;
 	io_channel	io;
 	int		length = EXT2_INODE_SIZE(fs->super);
 	struct ext2_inode_large	*iptr;
@@ -851,7 +853,8 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
 	errcode_t retval = 0;
 	struct ext2_inode_large *w_inode;
 	char *ptr;
-	int clen, i;
+	unsigned i;
+	int clen;
 	int length = EXT2_INODE_SIZE(fs->super);
 
 	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
diff --git a/lib/ext2fs/newdir.c b/lib/ext2fs/newdir.c
index f9bf8fc6..ed250c7c 100644
--- a/lib/ext2fs/newdir.c
+++ b/lib/ext2fs/newdir.c
@@ -97,7 +97,8 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
 /*
  * Create new directory on inline data
  */
-errcode_t ext2fs_new_dir_inline_data(ext2_filsys fs, ext2_ino_t dir_ino,
+errcode_t ext2fs_new_dir_inline_data(ext2_filsys fs,
+				     ext2_ino_t dir_ino EXT2FS_ATTR((unused)),
 				     ext2_ino_t parent_ino, __u32 *iblock)
 {
 	struct ext2_dir_entry 	*dir = NULL;