From 092982db106bfcab3f8affb8e7fc6e2cd9535ea6 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Wed, 18 Sep 2019 21:33:27 +1000 Subject: [PATCH] Make return result consistent with fixed src/utils/common/common.c - ssnprintf wrapper --- src/collectdctl.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/collectdctl.c b/src/collectdctl.c index df83b50b..3974fd06 100644 --- a/src/collectdctl.c +++ b/src/collectdctl.c @@ -81,8 +81,7 @@ extern char *optarg; extern int optind; -/* ssnprintf returns zero on success, one if truncation occurred - and a negative integer onerror. */ +/* _ssnprintf returns result from vsnprintf (consistent with snprintf) */ static int _ssnprintf(char *str, size_t sz, const char *format, ...) { va_list ap; va_start(ap, format); @@ -91,10 +90,7 @@ static int _ssnprintf(char *str, size_t sz, const char *format, ...) { va_end(ap); - if (ret < 0) { - return ret; - } - return (size_t)ret >= sz; + return ret; } /* int _ssnprintf */ __attribute__((noreturn)) static void exit_usage(const char *name, int status) { -- 2.11.0