From 5eb4f640b19e6675c5681c1b0f15b0f0672dd462 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sat, 12 Apr 2014 16:21:41 +0200 Subject: [PATCH] libite: Minor style cleanup of fsendfile() Signed-off-by: Joachim Nilsson --- copyfile.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/copyfile.c b/copyfile.c index b00f638..0a8a9d5 100644 --- a/copyfile.c +++ b/copyfile.c @@ -240,33 +240,32 @@ exit: */ size_t fsendfile (FILE *out, FILE *in, size_t sz) { - char *buf = malloc(BUFSIZ); - size_t blk = BUFSIZ, ret = 0, tot = 0; + char *buf; + size_t blk = BUFSIZ, num = 0, tot = 0; + buf = (char *)malloc(BUFSIZ); if (!buf) return -1; - while (!sz || tot < sz) - { + while (!sz || tot < sz) { if (sz && ((sz - tot) < BUFSIZ)) blk = sz - tot; - ret = fread(buf, 1, blk, in); - if (ret <= 0) + num = fread(buf, 1, blk, in); + if (num == 0) break; - if (out && (fwrite(buf, ret, 1, out) != 1)) - { - ret = -1; + if (out && (fwrite(buf, num, 1, out) != 1)) { + num = -1; break; } - tot += ret; + tot += num; } free(buf); - return (ret == (size_t)-1)? (size_t)-1 : tot; + return (num == (size_t)-1) ? (size_t)-1 : tot; } /* Tests if dst is a directory, if so, reallocates dst and appends src filename returning 1 */