Merge pull request #3283 from zebity/master

Consistent returns from ssnprintf/__ssnprintf wrappers, add ssnprintf2 for optional error handling.

diff --git a/src/collectdctl.c b/src/collectdctl.c
index df83b50..3974fd0 100644 (file)
--- 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) {

diff --git a/src/utils/common/common.c b/src/utils/common/common.c
index 6a0ac28..aad767e 100644 (file)
--- a/src/utils/common/common.c
+++ b/src/utils/common/common.c
@@ -89,8 +89,7 @@ char *sstrncpy(char *dest, const char *src, size_t n) {
   return dest;
 } /* char *sstrncpy */
 
-/* ssnprintf returns zero on success, one if truncation occurred
-   and a negative integer onerror. */
+/* ssnprintf returns result from vsnprintf conistent with snprintf */
 int ssnprintf(char *str, size_t sz, const char *format, ...) {
   va_list ap;
   va_start(ap, format);