diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-15 21:30:45 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-15 21:30:45 +0000 |
commit | 6b06cb80be64fcf207bee734cc678c25434ed1a4 (patch) | |
tree | aebc37ae3a2658fba3f57003102fa0dfb1a10ac8 /util-linux | |
parent | 43d5d429fd7a80ca02eb8388f058fd9654cc118d (diff) | |
download | busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.gz busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.bz2 busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.zip |
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 | |||
230 | create_sunlabel(void) | 230 | create_sunlabel(void) |
231 | { | 231 | { |
232 | struct hd_geometry geometry; | 232 | struct hd_geometry geometry; |
233 | unsigned int ndiv; | 233 | unsigned ndiv; |
234 | int i; | ||
235 | unsigned char c; | 234 | unsigned char c; |
236 | const struct sun_predefined_drives *p = NULL; | 235 | const struct sun_predefined_drives *p = NULL; |
237 | 236 | ||
@@ -241,6 +240,7 @@ create_sunlabel(void) | |||
241 | memset(MBRbuffer, 0, sizeof(MBRbuffer)); | 240 | memset(MBRbuffer, 0, sizeof(MBRbuffer)); |
242 | sunlabel->magic = SUN_SSWAP16(SUN_LABEL_MAGIC); | 241 | sunlabel->magic = SUN_SSWAP16(SUN_LABEL_MAGIC); |
243 | if (!floppy) { | 242 | if (!floppy) { |
243 | unsigned i; | ||
244 | puts("Drive type\n" | 244 | puts("Drive type\n" |
245 | " ? auto configure\n" | 245 | " ? auto configure\n" |
246 | " 0 custom (with hardware detected defaults)"); | 246 | " 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) | |||
147 | static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts) | 147 | static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts) |
148 | { | 148 | { |
149 | int exit_code = 0; /* We assume everything will be OK */ | 149 | int exit_code = 0; /* We assume everything will be OK */ |
150 | unsigned opt; | 150 | int opt; |
151 | #if ENABLE_GETOPT_LONG | 151 | #if ENABLE_GETOPT_LONG |
152 | int longindex; | 152 | int longindex; |
153 | #endif | 153 | #endif |
@@ -173,7 +173,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru | |||
173 | #else | 173 | #else |
174 | getopt(argc, argv, optstr); | 174 | getopt(argc, argv, optstr); |
175 | #endif | 175 | #endif |
176 | if (opt == EOF) | 176 | if (opt == -1) |
177 | break; | 177 | break; |
178 | if (opt == '?' || opt == ':' ) | 178 | if (opt == '?' || opt == ':' ) |
179 | exit_code = 1; | 179 | exit_code = 1; |
@@ -190,7 +190,7 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru | |||
190 | printf(" %s", normalize(optarg)); | 190 | printf(" %s", normalize(optarg)); |
191 | else { | 191 | else { |
192 | printf(" -%c", opt); | 192 | printf(" -%c", opt); |
193 | charptr = strchr(optstr,opt); | 193 | charptr = strchr(optstr, opt); |
194 | if (charptr != NULL && *++charptr == ':') | 194 | if (charptr != NULL && *++charptr == ':') |
195 | printf(" %s", | 195 | printf(" %s", |
196 | normalize(optarg ? optarg : "")); | 196 | 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) | |||
307 | 307 | ||
308 | // Loop through options | 308 | // Loop through options |
309 | for (;;) { | 309 | for (;;) { |
310 | size_t i; | 310 | unsigned i; |
311 | char *comma = strchr(options, ','); | 311 | char *comma = strchr(options, ','); |
312 | const char *option_str = mount_option_str; | 312 | const char *option_str = mount_option_str; |
313 | 313 | ||
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) | |||
167 | static const short offsets[] = { 0, 8, 64, 256 }; | 167 | static const short offsets[] = { 0, 8, 64, 256 }; |
168 | 168 | ||
169 | uint32_t magic; | 169 | uint32_t magic; |
170 | int i; | 170 | unsigned i; |
171 | struct ufs_super_block *ufs; | 171 | struct ufs_super_block *ufs; |
172 | 172 | ||
173 | dbg("probing at offset 0x%llx", (unsigned long long) off); | 173 | 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[] = { | |||
152 | 152 | ||
153 | int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) | 153 | int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) |
154 | { | 154 | { |
155 | size_t i; | 155 | unsigned i; |
156 | 156 | ||
157 | if (id == NULL) | 157 | if (id == NULL) |
158 | return -EINVAL; | 158 | return -EINVAL; |