diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-16 01:30:45 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-16 01:30:45 +0400 |
commit | 6b06cb80be64fcf207bee734cc678c25434ed1a4 (patch) | |
tree | aebc37ae3a2658fba3f57003102fa0dfb1a10ac8 /util-linux | |
parent | 43d5d429fd7a80ca02eb8388f058fd9654cc118d (diff) |
more of -Wall fixes from Cristian Ionescu-Idbohrn.
Some are fixing real bugs.
function old new delta
syslogd_main 938 958 +20
get_signum 136 143 +7
obj_load 777 782 +5
recv_from_to 210 214 +4
get_next_block 1795 1799 +4
display_topmem_process_list 1117 1121 +4
logread_main 484 487 +3
buffer_fill_and_print 73 76 +3
kill_main 687 689 +2
ll_remember_index 240 241 +1
do_stats 452 453 +1
if_readconf 166 165 -1
display_process_list 1192 1191 -1
run_applet_and_exit 507 505 -2
print_signames 33 31 -2
parse_one_line 1092 1090 -2
find_out_spec 57 55 -2
add_ksymoops_symbols 421 419 -2
ash_main 1407 1402 -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 11/8 up/down: 54/-17) Total: 37 bytes
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fdisk_sun.c | 4 | ||||
-rw-r--r-- | util-linux/getopt.c | 6 | ||||
-rw-r--r-- | util-linux/mount.c | 2 | ||||
-rw-r--r-- | util-linux/volume_id/unused_ufs.c | 2 | ||||
-rw-r--r-- | util-linux/volume_id/volume_id.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c index e595444c4..eec319c6e 100644 --- a/util-linux/fdisk_sun.c +++ b/util-linux/fdisk_sun.c @@ -230,8 +230,7 @@ static void create_sunlabel(void) { struct hd_geometry geometry; - unsigned int ndiv; - int i; + unsigned ndiv; unsigned char c; const struct sun_predefined_drives *p = NULL; @@ -241,6 +240,7 @@ create_sunlabel(void) memset(MBRbuffer, 0, sizeof(MBRbuffer)); sunlabel->magic = SUN_SSWAP16(SUN_LABEL_MAGIC); if (!floppy) { + unsigned i; puts("Drive type\n" " ? auto configure\n" " 0 custom (with hardware detected defaults)"); diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 2da348176..31790d2a7 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -147,7 +147,7 @@ static const char *normalize(const char *arg) static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts) { int exit_code = 0; /* We assume everything will be OK */ - unsigned opt; + int opt; #if ENABLE_GETOPT_LONG int longindex; #endif @@ -173,7 +173,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru #else getopt(argc, argv, optstr); #endif - if (opt == EOF) + if (opt == -1) break; if (opt == '?' || opt == ':' ) exit_code = 1; @@ -190,7 +190,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru printf(" %s", normalize(optarg)); else { printf(" -%c", opt); - charptr = strchr(optstr,opt); + charptr = strchr(optstr, opt); if (charptr != NULL && *++charptr == ':') printf(" %s", normalize(optarg ? optarg : "")); diff --git a/util-linux/mount.c b/util-linux/mount.c index 292f877af..3cfbc5600 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -307,7 +307,7 @@ static long parse_mount_options(char *options, char **unrecognized) // Loop through options for (;;) { - size_t i; + unsigned i; char *comma = strchr(options, ','); const char *option_str = mount_option_str; diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c index c666b86b8..86937585f 100644 --- a/util-linux/volume_id/unused_ufs.c +++ b/util-linux/volume_id/unused_ufs.c @@ -167,7 +167,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off) static const short offsets[] = { 0, 8, 64, 256 }; uint32_t magic; - int i; + unsigned i; struct ufs_super_block *ufs; dbg("probing at offset 0x%llx", (unsigned long long) off); diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c index aec96a26e..d81f3f94c 100644 --- a/util-linux/volume_id/volume_id.c +++ b/util-linux/volume_id/volume_id.c @@ -152,7 +152,7 @@ static const probe_fptr fs2[] = { int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) { - size_t i; + unsigned i; if (id == NULL) return -EINVAL; |