Merge branch 'collectd-5.8'

diff --cc src/table.c
index 80eca95,7cae3f7..cfe9a58
--- 1/src/table.c
--- 2/src/table.c
+++ b/src/table.c
@@@ -177,9 -174,11 +173,10 @@@ static int tbl_config_result(tbl_t *tbl
      return 1;
    }
  
-   res = realloc(tbl->results, (tbl->results_num + 1) * sizeof(*tbl->results));
+   tbl_result_t *res =
+       realloc(tbl->results, (tbl->results_num + 1) * sizeof(*tbl->results));
    if (res == NULL) {
 -    char errbuf[1024];
 -    log_err("realloc failed: %s.", sstrerror(errno, errbuf, sizeof(errbuf)));
 +    log_err("realloc failed: %s.", STRERRNO);
      return -1;
    }
  
@@@ -239,9 -233,10 +231,9 @@@ static int tbl_config_table(oconfig_ite
      return 1;
    }
  
-   tbl = realloc(tables, (tables_num + 1) * sizeof(*tables));
+   tbl_t *tbl = realloc(tables, (tables_num + 1) * sizeof(*tables));
    if (NULL == tbl) {
 -    char errbuf[1024];
 -    log_err("realloc failed: %s.", sstrerror(errno, errbuf, sizeof(errbuf)));
 +    log_err("realloc failed: %s.", STRERRNO);
      return -1;
    }
  

diff --cc src/utils_ovs.c
Simple merge

diff --cc src/write_graphite.c
Simple merge

diff --cc src/write_sensu.c
Simple merge

diff --cc src/write_tsdb.c
Simple merge