From ff7093f7b304b04e118eb2f3750a723485e1eb9d Mon Sep 17 00:00:00 2001 From: FRIGN Date: Mon, 9 Feb 2015 15:47:08 +0100 Subject: [PATCH] An additional size_t-fix in tail(1) --- tail.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tail.c b/tail.c index 760d676..36fec77 100644 --- a/tail.c +++ b/tail.c @@ -15,9 +15,8 @@ static void dropinit(FILE *fp, const char *str, size_t n) { char *buf = NULL; - size_t size = 0; + size_t size = 0, i = 0; ssize_t len; - unsigned long i = 0; while (i < n && (len = getline(&buf, &size, fp)) != -1) if (len > 0 && buf[len - 1] == '\n') @@ -30,14 +29,13 @@ static void taketail(FILE *fp, const char *str, size_t n) { char **ring = NULL; - long i, j; - size_t *size = NULL; + size_t i, j, *size = NULL; ring = ecalloc(n, sizeof *ring); size = ecalloc(n, sizeof *size); - for (i = j = 0; getline(&ring[i], &size[i], fp) != -1; i = j = (i + 1) % n) - ; + for (i = j = 0; getline(&ring[i], &size[i], fp) != -1; ) + i = j = (i + 1) % n; if (ferror(fp)) eprintf("%s: read error:", str);