Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 12 Jul 2017 16:58:18 +0000 (18:58 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 12 Jul 2017 16:58:18 +0000 (18:58 +0200)
1  2 
src/ipc.c

diff --combined src/ipc.c
+++ b/src/ipc.c
@@@ -95,10 -95,14 +95,10 @@@ __attribute__((nonnull(1))) static voi
  ipc_submit_g(const char *plugin_instance, const char *type,
               const char *type_instance, gauge_t value) /* {{{ */
  {
 -  value_t values[1];
    value_list_t vl = VALUE_LIST_INIT;
  
 -  values[0].gauge = value;
 -
 -  vl.values = values;
 +  vl.values = &(value_t){.gauge = value};
    vl.values_len = 1;
 -  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
    sstrncpy(vl.plugin, "ipc", sizeof(vl.plugin));
    sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance));
    sstrncpy(vl.type, type, sizeof(vl.type));
@@@ -251,14 -255,14 +251,14 @@@ static int ipc_read_shm(void) /* {{{ *
    ipcinfo_shm_t *pshm;
    unsigned int shm_segments = 0;
    size64_t shm_bytes = 0;
-   int n;
+   int i, n;
  
    ipcinfo_shm = (ipcinfo_shm_t *)ipc_get_info(
        0, GET_IPCINFO_SHM_ALL, IPCINFO_SHM_VERSION, sizeof(ipcinfo_shm_t), &n);
    if (ipcinfo_shm == NULL)
      return -1;
  
-   for (int i = 0, pshm = ipcinfo_shm; i < n; i++, pshm++) {
+   for (i = 0, pshm = ipcinfo_shm; i < n; i++, pshm++) {
      shm_segments++;
      shm_bytes += pshm->shm_segsz;
    }