Merge branch 'collectd-5.5'

diff --combined src/write_sensu.c
index 3339930,be65399..b0cf9fa
--- 1/src/write_sensu.c
--- 2/src/write_sensu.c
+++ b/src/write_sensu.c
@@@ -29,6 -29,7 +29,6 @@@
  #include "common.h"
  #include "configfile.h"
  #include "utils_cache.h"
 -#include <sys/socket.h>
  #include <arpa/inet.h>
  #include <errno.h>
  #include <netdb.h>
@@@ -37,53 -38,6 +37,6 @@@
  #include <stddef.h>
  
  #include <stdlib.h>
- #ifndef HAVE_ASPRINTF
- /*
-  * Uses asprintf() portable implementation from
-  * https://github.com/littlstar/asprintf.c/blob/master/
-  * copyright (c) 2014 joseph werle <joseph.werle@gmail.com> under MIT license.
-  */
- #include <stdio.h>
- #include <stdarg.h>
- 
- static int vasprintf(char **str, const char *fmt, va_list args) {
-       int size = 0;
-       va_list tmpa;
-       // copy
-       va_copy(tmpa, args);
-       // apply variadic arguments to
-       // sprintf with format to get size
-       size = vsnprintf(NULL, size, fmt, tmpa);
-       // toss args
-       va_end(tmpa);
-       // return -1 to be compliant if
-       // size is less than 0
-       if (size < 0) { return -1; }
-       // alloc with size plus 1 for `\0'
-       *str = (char *) malloc(size + 1);
-       // return -1 to be compliant
-       // if pointer is `NULL'
-       if (NULL == *str) { return -1; }
-       // format string with original
-       // variadic arguments and set new size
-       size = vsprintf(*str, fmt, args);
-       return size;
- }
- 
- static int asprintf(char **str, const char *fmt, ...) {
-       int size = 0;
-       va_list args;
-       // init variadic argumens
-       va_start(args, fmt);
-       // format and get size
-       size = vasprintf(str, fmt, args);
-       // toss args
-       va_end(args);
-       return size;
- }
- 
- #endif
- 
  #define SENSU_HOST            "localhost"
  #define SENSU_PORT            "3030"
  
@@@ -328,7 -282,7 +281,7 @@@ static char *sensu_value_to_json(struc
  {
        char name_buffer[5 * DATA_MAX_NAME_LEN];
        char service_buffer[6 * DATA_MAX_NAME_LEN];
 -      int i;
 +      size_t i;
        char *ret_str;
        char *temp_str;
        char *value_str;
@@@ -640,7 -594,7 +593,7 @@@ static char *sensu_notification_to_json
        char *ret_str;
        char *temp_str;
        int status;
 -      int i;
 +      size_t i;
        int res;
        // add the severity/status
        switch (n->severity) {
@@@ -884,7 -838,7 +837,7 @@@ static int sensu_write(const data_set_
        int statuses[vl->values_len];
        struct sensu_host       *host = ud->data;
        gauge_t *rates = NULL;
 -      int i;
 +      size_t i;
        char *msg;
  
        pthread_mutex_lock(&host->lock);
@@@ -898,7 -852,7 +851,7 @@@
                        return -1;
                }
        }
 -      for (i = 0; i < (size_t) vl->values_len; i++) {
 +      for (i = 0; i < vl->values_len; i++) {
                msg = sensu_value_to_json(host, ds, vl, (int) i, rates, statuses[i]);
                if (msg == NULL) {
                        sfree(rates);