From: Matthias Runge <mrunge@redhat.com>
Date: Wed, 9 Oct 2019 12:41:47 +0000 (+0200)
Subject: Merge tag 'collectd-5.9.2'
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a503c54a95d139f117650a0e6d80e6edfe81e8bf;hp=-c;p=collectd.git

Merge tag 'collectd-5.9.2'
---

a503c54a95d139f117650a0e6d80e6edfe81e8bf
diff --combined src/utils/common/common.c
index 2d961d43,8b2521de..6a0ac28f
--- a/src/utils/common/common.c
+++ b/src/utils/common/common.c
@@@ -99,10 -99,7 +99,7 @@@ int ssnprintf(char *str, size_t sz, con
  
    va_end(ap);
  
-   if (ret < 0) {
-     return ret;
-   }
-   return (size_t)ret >= sz;
+   return ret;
  } /* int ssnprintf */
  
  char *ssnprintf_alloc(char const *format, ...) /* {{{ */
@@@ -1456,13 -1453,13 +1453,13 @@@ int service_name_to_port_number(const c
        service_number = (int)ntohs(sa->sin6_port);
      }
  
 -    if ((service_number > 0) && (service_number <= 65535))
 +    if (service_number > 0)
        break;
    }
  
    freeaddrinfo(ai_list);
  
 -  if ((service_number > 0) && (service_number <= 65535))
 +  if (service_number > 0)
      return service_number;
    return -1;
  } /* int service_name_to_port_number */
diff --combined version-gen.sh
index 048b5a21,0298a443..76bd065a
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="5.8.1.git"
 -DEFAULT_VERSION="5.9.0.git"
++DEFAULT_VERSION="5.9.2.git"
  
  if [ -d .git ]; then
  	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"