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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user