diff options
| author | Denis Vlasenko | 2008-05-13 02:27:31 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-05-13 02:27:31 +0000 |
| commit | 77ad97f199f1bf05e9a7609bbdd239dab825b258 (patch) | |
| tree | cf117ebf8d4a50bc7ba0e4da4d60a98a944756c8 /util-linux/mount.c | |
| parent | c4f12f59cc907577d787f816b37122809f896bb2 (diff) | |
| download | busybox-77ad97f199f1bf05e9a7609bbdd239dab825b258.zip busybox-77ad97f199f1bf05e9a7609bbdd239dab825b258.tar.gz | |
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 4b8aea8..292f877 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 (;;) { - int i; + size_t i; char *comma = strchr(options, ','); const char *option_str = mount_option_str; @@ -1004,7 +1004,7 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) bb_herror_msg("%s", hostname); goto fail; } - if (hp->h_length > sizeof(struct in_addr)) { + if ((size_t)hp->h_length > sizeof(struct in_addr)) { bb_error_msg("got bad hp->h_length"); hp->h_length = sizeof(struct in_addr); } @@ -1279,15 +1279,14 @@ static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) if (hp == NULL) { bb_herror_msg("%s", mounthost); goto fail; - } else { - if (hp->h_length > sizeof(struct in_addr)) { - bb_error_msg("got bad hp->h_length?"); - hp->h_length = sizeof(struct in_addr); - } - mount_server_addr.sin_family = AF_INET; - memcpy(&mount_server_addr.sin_addr, - hp->h_addr, hp->h_length); } + if ((size_t)hp->h_length > sizeof(struct in_addr)) { + bb_error_msg("got bad hp->h_length"); + hp->h_length = sizeof(struct in_addr); + } + mount_server_addr.sin_family = AF_INET; + memcpy(&mount_server_addr.sin_addr, + hp->h_addr, hp->h_length); } } |