aboutsummaryrefslogtreecommitdiff
path: root/coreutils/tail.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-05-13 02:27:31 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-05-13 02:27:31 +0000
commit77ad97f199f1bf05e9a7609bbdd239dab825b258 (patch)
treecf117ebf8d4a50bc7ba0e4da4d60a98a944756c8 /coreutils/tail.c
parentc4f12f59cc907577d787f816b37122809f896bb2 (diff)
downloadbusybox-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 'coreutils/tail.c')
-rw-r--r--coreutils/tail.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 2f997a9f6..2505fc3a6 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -92,7 +92,8 @@ int tail_main(int argc, char **argv)
92 size_t tailbufsize; 92 size_t tailbufsize;
93 int taillen = 0; 93 int taillen = 0;
94 int newlines_seen = 0; 94 int newlines_seen = 0;
95 int nfiles, nread, nwrite, seen, i, opt; 95 int nfiles, nread, nwrite, i, opt;
96 unsigned seen;
96 97
97 int *fds; 98 int *fds;
98 char *s, *buf; 99 char *s, *buf;
@@ -210,7 +211,7 @@ int tail_main(int argc, char **argv)
210 } else if (count) { 211 } else if (count) {
211 if (COUNT_BYTES) { 212 if (COUNT_BYTES) {
212 taillen += nread; 213 taillen += nread;
213 if (taillen > count) { 214 if (taillen > (int)count) {
214 memmove(tailbuf, tailbuf + taillen - count, count); 215 memmove(tailbuf, tailbuf + taillen - count, count);
215 taillen = count; 216 taillen = count;
216 } 217 }
@@ -225,7 +226,7 @@ int tail_main(int argc, char **argv)
225 } 226 }
226 } while (k); 227 } while (k);
227 228
228 if (newlines_seen + newlines_in_buf < count) { 229 if (newlines_seen + newlines_in_buf < (int)count) {
229 newlines_seen += newlines_in_buf; 230 newlines_seen += newlines_in_buf;
230 taillen += nread; 231 taillen += nread;
231 } else { 232 } else {
@@ -243,7 +244,7 @@ int tail_main(int argc, char **argv)
243 memmove(tailbuf, s, taillen); 244 memmove(tailbuf, s, taillen);
244 newlines_seen = count - extra; 245 newlines_seen = count - extra;
245 } 246 }
246 if (tailbufsize < taillen + BUFSIZ) { 247 if (tailbufsize < (size_t)taillen + BUFSIZ) {
247 tailbufsize = taillen + BUFSIZ; 248 tailbufsize = taillen + BUFSIZ;
248 tailbuf = xrealloc(tailbuf, tailbufsize); 249 tailbuf = xrealloc(tailbuf, tailbufsize);
249 } 250 }