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 /coreutils/tail.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 'coreutils/tail.c')
| -rw-r--r-- | coreutils/tail.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/coreutils/tail.c b/coreutils/tail.c index 2f997a9..2505fc3 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -92,7 +92,8 @@ int tail_main(int argc, char **argv) size_t tailbufsize; int taillen = 0; int newlines_seen = 0; - int nfiles, nread, nwrite, seen, i, opt; + int nfiles, nread, nwrite, i, opt; + unsigned seen; int *fds; char *s, *buf; @@ -210,7 +211,7 @@ int tail_main(int argc, char **argv) } else if (count) { if (COUNT_BYTES) { taillen += nread; - if (taillen > count) { + if (taillen > (int)count) { memmove(tailbuf, tailbuf + taillen - count, count); taillen = count; } @@ -225,7 +226,7 @@ int tail_main(int argc, char **argv) } } while (k); - if (newlines_seen + newlines_in_buf < count) { + if (newlines_seen + newlines_in_buf < (int)count) { newlines_seen += newlines_in_buf; taillen += nread; } else { @@ -243,7 +244,7 @@ int tail_main(int argc, char **argv) memmove(tailbuf, s, taillen); newlines_seen = count - extra; } - if (tailbufsize < taillen + BUFSIZ) { + if (tailbufsize < (size_t)taillen + BUFSIZ) { tailbufsize = taillen + BUFSIZ; tailbuf = xrealloc(tailbuf, tailbufsize); } |