From 34a3a855c4335f2a388f0184ec868b1cbfe326c5 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 5 Jun 2018 13:37:56 -0600 Subject: [PATCH] log: fix signedness issue Signed-off-by: Jens Axboe --- log.c | 10 +++++----- log.h | 4 ++-- parse.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/log.c b/log.c index 46e5034e..6c36813d 100644 --- a/log.c +++ b/log.c @@ -15,7 +15,7 @@ size_t log_info_buf(const char *buf, size_t len) return 0; if (is_backend) { - size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len); + ssize_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len); if (ret != -1) return ret; } @@ -65,10 +65,10 @@ void log_prevalist(int type, const char *fmt, va_list args) free(buf2); } -size_t log_info(const char *format, ...) +ssize_t log_info(const char *format, ...) { va_list args; - size_t ret; + ssize_t ret; va_start(args, format); ret = log_valist(format, args); @@ -102,9 +102,9 @@ int log_info_flush(void) return fflush(f_out); } -size_t log_err(const char *format, ...) +ssize_t log_err(const char *format, ...) { - size_t ret; + ssize_t ret; int len; char *buffer; va_list args; diff --git a/log.h b/log.h index 8163f977..b50d4484 100644 --- a/log.h +++ b/log.h @@ -9,8 +9,8 @@ extern FILE *f_out; extern FILE *f_err; -extern size_t log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); -extern size_t log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); +extern ssize_t log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); +extern ssize_t log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); extern size_t __log_buf(struct buf_output *, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3))); extern size_t log_valist(const char *str, va_list); extern void log_prevalist(int type, const char *str, va_list); diff --git a/parse.c b/parse.c index 9685f1ea..6261fca2 100644 --- a/parse.c +++ b/parse.c @@ -69,7 +69,7 @@ static void posval_sort(const struct fio_option *o, struct value_pair *vpmap) } static void show_option_range(const struct fio_option *o, - size_t (*logger)(const char *format, ...)) + ssize_t (*logger)(const char *format, ...)) { if (o->type == FIO_OPT_FLOAT_LIST) { const char *sep = ""; @@ -132,7 +132,7 @@ static void show_option_help(const struct fio_option *o, int is_err) "deprecated", "unsupported", }; - size_t (*logger)(const char *format, ...); + ssize_t (*logger)(const char *format, ...); if (is_err) logger = log_err; -- 2.25.1