Fix various gcc -Wall complaints.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
diff --git a/misc/ChangeLog b/misc/ChangeLog
index ebad1c4..773473f 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-10 Theodore Ts'o <tytso@mit.edu>
+
+ * dumpe2fs.c, e2image.c, filefrag.c, mke2fs.c: Fix various gcc
+ -Wall complaints.
+
2005-12-09 Theodore Ts'o <tytso@mit.edu>
* mke2fs.8.in: Add more text describing the mke2fs -T option.
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index b6995fd..c24dccf 100644
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -46,8 +46,7 @@
const char * program_name = "dumpe2fs";
char * device_name = NULL;
-const char *num_format = "%lu";
-char range_format[16];
+int hex_format = 0;
static void usage(void)
{
@@ -56,9 +55,20 @@
exit (1);
}
-static void print_number (unsigned long num)
+static void print_number(unsigned long num)
{
- printf(num_format, num);
+ if (hex_format)
+ printf("0x%04lx", num);
+ else
+ printf("%lu", num);
+}
+
+static void print_range(unsigned long a, unsigned long b)
+{
+ if (hex_format)
+ printf("0x%04lx-0x%04lx", a, b);
+ else
+ printf("%lu-%lu", a, b);
}
static void print_free (unsigned long group, char * bitmap,
@@ -119,7 +129,7 @@
if (next_blk > fs->super->s_blocks_count)
next_blk = fs->super->s_blocks_count;
printf (_("Group %lu: (Blocks "), i);
- printf(range_format, group_blk, next_blk - 1);
+ print_range(group_blk, next_blk - 1);
fputs(")\n", stdout);
has_super = ((i==0) || super_blk);
if (has_super) {
@@ -129,14 +139,13 @@
}
if (old_desc_blk) {
printf(_(", Group descriptors at "));
- printf(range_format, old_desc_blk,
- old_desc_blk + old_desc_blocks - 1);
+ print_range(old_desc_blk,
+ old_desc_blk + old_desc_blocks - 1);
if (reserved_gdt) {
printf(_("\n Reserved GDT blocks at "));
- printf(range_format,
- old_desc_blk + old_desc_blocks,
- old_desc_blk + old_desc_blocks +
- reserved_gdt - 1);
+ print_range(old_desc_blk + old_desc_blocks,
+ old_desc_blk + old_desc_blocks +
+ reserved_gdt - 1);
}
} else if (new_desc_blk) {
fputc(has_super ? ',' : ' ', stdout);
@@ -157,9 +166,9 @@
if (diff >= 0)
printf(" (+%ld)", diff);
fputs(_("\n Inode table at "), stdout);
- printf(range_format, fs->group_desc[i].bg_inode_table,
- fs->group_desc[i].bg_inode_table +
- inode_blocks_per_group - 1);
+ print_range(fs->group_desc[i].bg_inode_table,
+ fs->group_desc[i].bg_inode_table +
+ inode_blocks_per_group - 1);
diff = fs->group_desc[i].bg_inode_table - group_blk;
if (diff > 0)
printf(" (+%ld)", diff);
@@ -197,7 +206,7 @@
retval = ext2fs_read_bb_inode(fs, &bb_list);
if (retval) {
- com_err("ext2fs_read_bb_inode", retval, "");
+ com_err("ext2fs_read_bb_inode", retval, 0);
return;
}
retval = ext2fs_badblocks_list_iterate_begin(bb_list, &bb_iter);
@@ -316,7 +325,7 @@
error_message(EXT2_ET_BASE));
exit(0);
case 'x':
- num_format = "0x%04x";
+ hex_format++;
break;
default:
usage();
@@ -324,7 +333,6 @@
}
if (optind > argc - 1)
usage();
- sprintf(range_format, "%s-%s", num_format, num_format);
device_name = argv[optind++];
if (use_superblock && !use_blocksize)
use_blocksize = 1024;
diff --git a/misc/e2image.c b/misc/e2image.c
index a7fc9b5..19f2c51 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -357,7 +357,8 @@
if (rec_len < 8 || (rec_len % 4) ||
(p+rec_len > end)) {
printf("Corrupt directory block %lu: "
- "bad rec_len (%d)\n", blk, rec_len);
+ "bad rec_len (%d)\n", (unsigned long) blk,
+ rec_len);
rec_len = end - p;
#ifdef EXT2FS_ENABLE_SWAPFS
if (fs->flags & EXT2_FLAG_SWAP_BYTES)
@@ -367,7 +368,8 @@
}
if (dirent->name_len + 8 > rec_len) {
printf("Corrupt directory block %lu: "
- "bad name_len (%d)\n", blk, dirent->name_len);
+ "bad name_len (%d)\n", (unsigned long) blk,
+ dirent->name_len);
dirent->name_len = rec_len - 8;
continue;
}
diff --git a/misc/filefrag.c b/misc/filefrag.c
index d8e3754..8cd9d01 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -118,7 +118,7 @@
is_ext2 = 0;
}
if (verbose)
- printf("Blocksize of file %s is %ld\n", filename, bs);
+ printf("Blocksize of file %s is %d\n", filename, bs);
bpib = bs / 4;
numblocks = (fileinfo.st_size + (bs-1)) / bs;
if (verbose) {
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index acdb842..c80c1ef 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -78,7 +78,7 @@
char *bad_blocks_filename;
__u32 fs_stride;
-struct ext2_super_block param;
+struct ext2_super_block fs_param;
char *creator_os;
char *volume_label;
char *mount_dir;
@@ -691,9 +691,9 @@
dgrp_t i;
int need, col_left;
- if (param.s_blocks_count != s->s_blocks_count)
+ if (fs_param.s_blocks_count != s->s_blocks_count)
fprintf(stderr, _("warning: %d blocks unused.\n\n"),
- param.s_blocks_count - s->s_blocks_count);
+ fs_param.s_blocks_count - s->s_blocks_count);
memset(buf, 0, sizeof(buf));
strncpy(buf, s->s_volume_name, sizeof(s->s_volume_name));
@@ -857,7 +857,7 @@
rsv_groups = (resize + bpg - 1) / bpg;
rsv_gdb = (rsv_groups + gdpb - 1) / gdpb -
desc_blocks;
- if (rsv_gdb > EXT2_ADDR_PER_BLOCK(param))
+ if (rsv_gdb > (int) EXT2_ADDR_PER_BLOCK(param))
rsv_gdb = EXT2_ADDR_PER_BLOCK(param);
if (rsv_gdb > 0) {
@@ -945,12 +945,12 @@
setbuf(stdout, NULL);
setbuf(stderr, NULL);
initialize_ext2_error_table();
- memset(¶m, 0, sizeof(struct ext2_super_block));
- param.s_rev_level = 1; /* Create revision 1 filesystems now */
- param.s_feature_incompat |= EXT2_FEATURE_INCOMPAT_FILETYPE;
- param.s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
+ memset(&fs_param, 0, sizeof(struct ext2_super_block));
+ fs_param.s_rev_level = 1; /* Create revision 1 filesystems now */
+ fs_param.s_feature_incompat |= EXT2_FEATURE_INCOMPAT_FILETYPE;
+ fs_param.s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
#if 0
- param.s_feature_compat |= EXT2_FEATURE_COMPAT_DIR_INDEX;
+ fs_param.s_feature_compat |= EXT2_FEATURE_COMPAT_DIR_INDEX;
#endif
#ifdef __linux__
@@ -960,10 +960,10 @@
}
linux_version_code = parse_version_number(ut.release);
if (linux_version_code && linux_version_code < (2*65536 + 2*256)) {
- param.s_rev_level = 0;
- param.s_feature_incompat = 0;
- param.s_feature_compat = 0;
- param.s_feature_ro_compat = 0;
+ fs_param.s_rev_level = 0;
+ fs_param.s_feature_incompat = 0;
+ fs_param.s_feature_compat = 0;
+ fs_param.s_feature_ro_compat = 0;
}
#endif
@@ -992,7 +992,7 @@
"usable on most systems.\n"),
blocksize);
if (blocksize > 0)
- param.s_log_block_size =
+ fs_param.s_log_block_size =
int_log2(blocksize >>
EXT2_MIN_BLOCK_LOG_SIZE);
break;
@@ -1009,19 +1009,19 @@
optarg);
exit(1);
}
- param.s_log_frag_size =
+ fs_param.s_log_frag_size =
int_log2(size >> EXT2_MIN_BLOCK_LOG_SIZE);
fprintf(stderr, _("Warning: fragments not supported. "
"Ignoring -f option\n"));
break;
case 'g':
- param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
+ fs_param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
if (*tmp) {
com_err(program_name, 0,
_("Illegal number for blocks per group"));
exit(1);
}
- if ((param.s_blocks_per_group % 8) != 0) {
+ if ((fs_param.s_blocks_per_group % 8) != 0) {
com_err(program_name, 0,
_("blocks per group must be multiple of 8"));
exit(1);
@@ -1043,7 +1043,7 @@
parse_journal_opts(optarg);
break;
case 'j':
- param.s_feature_compat |=
+ fs_param.s_feature_compat |=
EXT3_FEATURE_COMPAT_HAS_JOURNAL;
if (!journal_size)
journal_size = -1;
@@ -1076,24 +1076,24 @@
quiet = 1;
break;
case 'r':
- param.s_rev_level = strtoul(optarg, &tmp, 0);
+ fs_param.s_rev_level = strtoul(optarg, &tmp, 0);
if (*tmp) {
com_err(program_name, 0,
_("bad revision level - %s"), optarg);
exit(1);
}
- if (param.s_rev_level == EXT2_GOOD_OLD_REV) {
- param.s_feature_incompat = 0;
- param.s_feature_compat = 0;
- param.s_feature_ro_compat = 0;
+ if (fs_param.s_rev_level == EXT2_GOOD_OLD_REV) {
+ fs_param.s_feature_incompat = 0;
+ fs_param.s_feature_compat = 0;
+ fs_param.s_feature_ro_compat = 0;
}
break;
case 's': /* deprecated */
if (atoi(optarg))
- param.s_feature_ro_compat |=
+ fs_param.s_feature_ro_compat |=
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
else
- param.s_feature_ro_compat &=
+ fs_param.s_feature_ro_compat &=
~EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
break;
#ifdef EXT2_DYNAMIC_REV
@@ -1128,13 +1128,13 @@
break;
case 'O':
if (!strcmp(optarg, "none")) {
- param.s_feature_compat = 0;
- param.s_feature_incompat = 0;
- param.s_feature_ro_compat = 0;
+ fs_param.s_feature_compat = 0;
+ fs_param.s_feature_incompat = 0;
+ fs_param.s_feature_ro_compat = 0;
break;
}
if (e2p_edit_feature(optarg,
- ¶m.s_feature_compat,
+ &fs_param.s_feature_compat,
ok_features)) {
fprintf(stderr,
_("Invalid filesystem option set: %s\n"), optarg);
@@ -1204,7 +1204,7 @@
exit(1);
}
blocksize = jfs->blocksize;
- param.s_log_block_size =
+ fs_param.s_log_block_size =
int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
ext2fs_close(jfs);
}
@@ -1221,15 +1221,15 @@
blocksize, sys_page_size);
}
if ((blocksize > 4096) &&
- (param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL))
+ (fs_param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL))
fprintf(stderr, _("\nWarning: some 2.4 kernels do not support "
"blocksizes greater than 4096\n\tusing ext3. "
"Use -b 4096 if this is an issue for you.\n\n"));
if (optind < argc) {
- param.s_blocks_count = parse_num_blocks(argv[optind++],
- param.s_log_block_size);
- if (!param.s_blocks_count) {
+ fs_param.s_blocks_count = parse_num_blocks(argv[optind++],
+ fs_param.s_log_block_size);
+ if (!fs_param.s_blocks_count) {
com_err(program_name, 0, _("invalid blocks count - %s"),
argv[optind - 1]);
exit(1);
@@ -1238,37 +1238,37 @@
if (optind < argc)
usage();
- if (param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
+ if (fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
if (!fs_type)
fs_type = "journal";
reserved_ratio = 0;
- param.s_feature_incompat = EXT3_FEATURE_INCOMPAT_JOURNAL_DEV;
- param.s_feature_compat = 0;
- param.s_feature_ro_compat = 0;
+ fs_param.s_feature_incompat = EXT3_FEATURE_INCOMPAT_JOURNAL_DEV;
+ fs_param.s_feature_compat = 0;
+ fs_param.s_feature_ro_compat = 0;
}
- if (param.s_rev_level == EXT2_GOOD_OLD_REV &&
- (param.s_feature_compat || param.s_feature_ro_compat ||
- param.s_feature_incompat))
- param.s_rev_level = 1; /* Create a revision 1 filesystem */
+ if (fs_param.s_rev_level == EXT2_GOOD_OLD_REV &&
+ (fs_param.s_feature_compat || fs_param.s_feature_ro_compat ||
+ fs_param.s_feature_incompat))
+ fs_param.s_rev_level = 1; /* Create a revision 1 filesystem */
if (!force)
check_plausibility(device_name);
check_mount(device_name, force, _("filesystem"));
- param.s_log_frag_size = param.s_log_block_size;
+ fs_param.s_log_frag_size = fs_param.s_log_block_size;
- if (noaction && param.s_blocks_count) {
- dev_size = param.s_blocks_count;
+ if (noaction && fs_param.s_blocks_count) {
+ dev_size = fs_param.s_blocks_count;
retval = 0;
} else {
retry:
retval = ext2fs_get_device_size(device_name,
- EXT2_BLOCK_SIZE(¶m),
+ EXT2_BLOCK_SIZE(&fs_param),
&dev_size);
if ((retval == EFBIG) &&
(blocksize == 0) &&
- (param.s_log_block_size == 0)) {
- param.s_log_block_size = 2;
+ (fs_param.s_log_block_size == 0)) {
+ fs_param.s_log_block_size = 2;
blocksize = 4096;
goto retry;
}
@@ -1279,7 +1279,7 @@
_("while trying to determine filesystem size"));
exit(1);
}
- if (!param.s_blocks_count) {
+ if (!fs_param.s_blocks_count) {
if (retval == EXT2_ET_UNIMPLEMENTED) {
com_err(program_name, 0,
_("Couldn't determine device size; you "
@@ -1299,13 +1299,13 @@
));
exit(1);
}
- param.s_blocks_count = dev_size;
- if (sys_page_size > EXT2_BLOCK_SIZE(¶m))
- param.s_blocks_count &= ~((sys_page_size /
- EXT2_BLOCK_SIZE(¶m))-1);
+ fs_param.s_blocks_count = dev_size;
+ if (sys_page_size > EXT2_BLOCK_SIZE(&fs_param))
+ fs_param.s_blocks_count &= ~((sys_page_size /
+ EXT2_BLOCK_SIZE(&fs_param))-1);
}
- } else if (!force && (param.s_blocks_count > dev_size)) {
+ } else if (!force && (fs_param.s_blocks_count > dev_size)) {
com_err(program_name, 0,
_("Filesystem larger than apparent device size."));
proceed_question();
@@ -1315,15 +1315,15 @@
* If the user asked for HAS_JOURNAL, then make sure a journal
* gets created.
*/
- if ((param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
+ if ((fs_param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
!journal_size)
journal_size = -1;
/* Set first meta blockgroup via an environment variable */
/* (this is mostly for debugging purposes) */
- if ((param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&
+ if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) &&
((tmp = getenv("MKE2FS_FIRST_META_BG"))))
- param.s_first_meta_bg = atoi(tmp);
+ fs_param.s_first_meta_bg = atoi(tmp);
/* Get the hardware sector size, if available */
retval = ext2fs_get_device_sectsize(device_name, §or_size);
@@ -1336,33 +1336,34 @@
if ((tmp = getenv("MKE2FS_DEVICE_SECTSIZE")) != NULL)
sector_size = atoi(tmp);
- set_fs_defaults(fs_type, ¶m, blocksize, sector_size, &inode_ratio);
- blocksize = EXT2_BLOCK_SIZE(¶m);
+ set_fs_defaults(fs_type, &fs_param, blocksize, sector_size,
+ &inode_ratio);
+ blocksize = EXT2_BLOCK_SIZE(&fs_param);
if (extended_opts)
- parse_extended_opts(¶m, extended_opts);
+ parse_extended_opts(&fs_param, extended_opts);
/* Since sparse_super is the default, we would only have a problem
* here if it was explicitly disabled.
*/
- if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
- !(param.s_feature_ro_compat&EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
+ if ((fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
+ !(fs_param.s_feature_ro_compat&EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
com_err(program_name, 0,
_("reserved online resize blocks not supported "
"on non-sparse filesystem"));
exit(1);
}
- if (param.s_blocks_per_group) {
- if (param.s_blocks_per_group < 256 ||
- param.s_blocks_per_group > 8 * (unsigned) blocksize) {
+ if (fs_param.s_blocks_per_group) {
+ if (fs_param.s_blocks_per_group < 256 ||
+ fs_param.s_blocks_per_group > 8 * (unsigned) blocksize) {
com_err(program_name, 0,
_("blocks per group count out of range"));
exit(1);
}
}
- if (!force && param.s_blocks_count >= (1 << 31)) {
+ if (!force && fs_param.s_blocks_count >= (1 << 31)) {
com_err(program_name, 0,
_("Filesystem too large. No more than 2**31-1 blocks\n"
"\t (8TB using a blocksize of 4k) are currently supported."));
@@ -1371,7 +1372,7 @@
if (inode_size) {
if (inode_size < EXT2_GOOD_OLD_INODE_SIZE ||
- inode_size > EXT2_BLOCK_SIZE(¶m) ||
+ inode_size > EXT2_BLOCK_SIZE(&fs_param) ||
inode_size & (inode_size - 1)) {
com_err(program_name, 0,
_("invalid inode size %d (min %d/max %d)"),
@@ -1383,20 +1384,21 @@
fprintf(stderr, _("Warning: %d-byte inodes not usable "
"on most systems\n"),
inode_size);
- param.s_inode_size = inode_size;
+ fs_param.s_inode_size = inode_size;
}
/*
* Calculate number of inodes based on the inode ratio
*/
- param.s_inodes_count = num_inodes ? num_inodes :
- ((__u64) param.s_blocks_count * blocksize)
+ fs_param.s_inodes_count = num_inodes ? num_inodes :
+ ((__u64) fs_param.s_blocks_count * blocksize)
/ inode_ratio;
/*
* Calculate number of blocks to reserve
*/
- param.s_r_blocks_count = (param.s_blocks_count * reserved_ratio) / 100;
+ fs_param.s_r_blocks_count = (fs_param.s_blocks_count * reserved_ratio)
+ / 100;
}
int main (int argc, char *argv[])
@@ -1427,7 +1429,7 @@
/*
* Initialize the superblock....
*/
- retval = ext2fs_initialize(device_name, 0, ¶m,
+ retval = ext2fs_initialize(device_name, 0, &fs_param,
io_ptr, &fs);
if (retval) {
com_err(device_name, retval, _("while setting up superblock"));