diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-13 02:27:31 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-13 02:27:31 +0000 |
commit | 77ad97f199f1bf05e9a7609bbdd239dab825b258 (patch) | |
tree | cf117ebf8d4a50bc7ba0e4da4d60a98a944756c8 /util-linux/mount.c | |
parent | c4f12f59cc907577d787f816b37122809f896bb2 (diff) | |
download | busybox-w32-77ad97f199f1bf05e9a7609bbdd239dab825b258.tar.gz busybox-w32-77ad97f199f1bf05e9a7609bbdd239dab825b258.tar.bz2 busybox-w32-77ad97f199f1bf05e9a7609bbdd239dab825b258.zip |
more -Wall warning fixes from Cristian Ionescu-Idbohrn.
This time it resulted in small code changes:
function old new delta
nexpr 820 828 +8
tail_main 1200 1202 +2
wrapf 166 167 +1
parse_mount_options 227 209 -18
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 11/-18) Total: -7 bytes
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r-- | util-linux/mount.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 4b8aea8c6..292f877af 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 | int i; | 310 | size_t 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 | ||
@@ -1004,7 +1004,7 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) | |||
1004 | bb_herror_msg("%s", hostname); | 1004 | bb_herror_msg("%s", hostname); |
1005 | goto fail; | 1005 | goto fail; |
1006 | } | 1006 | } |
1007 | if (hp->h_length > sizeof(struct in_addr)) { | 1007 | if ((size_t)hp->h_length > sizeof(struct in_addr)) { |
1008 | bb_error_msg("got bad hp->h_length"); | 1008 | bb_error_msg("got bad hp->h_length"); |
1009 | hp->h_length = sizeof(struct in_addr); | 1009 | hp->h_length = sizeof(struct in_addr); |
1010 | } | 1010 | } |
@@ -1279,15 +1279,14 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) | |||
1279 | if (hp == NULL) { | 1279 | if (hp == NULL) { |
1280 | bb_herror_msg("%s", mounthost); | 1280 | bb_herror_msg("%s", mounthost); |
1281 | goto fail; | 1281 | goto fail; |
1282 | } else { | ||
1283 | if (hp->h_length > sizeof(struct in_addr)) { | ||
1284 | bb_error_msg("got bad hp->h_length?"); | ||
1285 | hp->h_length = sizeof(struct in_addr); | ||
1286 | } | ||
1287 | mount_server_addr.sin_family = AF_INET; | ||
1288 | memcpy(&mount_server_addr.sin_addr, | ||
1289 | hp->h_addr, hp->h_length); | ||
1290 | } | 1282 | } |
1283 | if ((size_t)hp->h_length > sizeof(struct in_addr)) { | ||
1284 | bb_error_msg("got bad hp->h_length"); | ||
1285 | hp->h_length = sizeof(struct in_addr); | ||
1286 | } | ||
1287 | mount_server_addr.sin_family = AF_INET; | ||
1288 | memcpy(&mount_server_addr.sin_addr, | ||
1289 | hp->h_addr, hp->h_length); | ||
1291 | } | 1290 | } |
1292 | } | 1291 | } |
1293 | 1292 | ||