From 6fdffeb3551d6ab1c03f0aed221941fcab8d8849 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Mon, 6 Jun 2016 17:18:02 +0200 Subject: [PATCH] fsendfile(): Change return type size_t --> ssize_t Most send/recv/read/write API's return -1 on error and today use the agreed upon type ssize_t for this purpose. Signed-off-by: Joachim Nilsson --- fsendfile.c | 7 ++++--- lite.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fsendfile.c b/fsendfile.c index efc9786..61921c8 100644 --- a/fsendfile.c +++ b/fsendfile.c @@ -41,10 +41,11 @@ * The number of bytes copied. If an error is detected -1 is returned * and @errno will be set accordingly. */ -size_t fsendfile(FILE *src, FILE *dst, size_t len) +ssize_t fsendfile(FILE *src, FILE *dst, size_t len) { char *buf; - size_t blk = BUFSIZ, num = 0, tot = 0; + size_t tot = 0; + ssize_t blk = BUFSIZ, num = 0; if (!src) { errno = EINVAL; @@ -73,7 +74,7 @@ size_t fsendfile(FILE *src, FILE *dst, size_t len) free(buf); - return (num == (size_t)-1) ? (size_t)-1 : tot; + return (num == -1) ? -1 : (ssize_t)tot; } #ifdef UNITTEST diff --git a/lite.h b/lite.h index 730eb87..4a6c7e8 100644 --- a/lite.h +++ b/lite.h @@ -56,7 +56,7 @@ FILE *tempfile (void); ssize_t copyfile (char *src, char *dst, int len, int sym); int movefile (char *src, char *dst); int fcopyfile (FILE *src, FILE *dst); -size_t fsendfile (FILE *src, FILE *dst, size_t len); +ssize_t fsendfile (FILE *src, FILE *dst, size_t len); int ifconfig (char *ifname, char *addr, char *mask, int up);