X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrdcached.c;h=3db89b5e6b2d7336788fdb3c06f69e464367abf4;hb=f2f7049e8faff8043b12d7c7548d9398d3b3ada4;hp=0425419445d738a6e80992c77c51b229112ca173;hpb=b847e8ff2fd928813397466a941947c8fce66d66;p=collectd.git diff --git a/src/rrdcached.c b/src/rrdcached.c index 04254194..3db89b5e 100644 --- a/src/rrdcached.c +++ b/src/rrdcached.c @@ -292,8 +292,9 @@ static int rc_read (void) int status; rrdc_stats_t *head; - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; + vl.values = &(value_t) { .gauge = NAN }; + vl.values_len = 1; if (daemon_address == NULL) return (-1); @@ -301,13 +302,8 @@ static int rc_read (void) if (!config_collect_stats) return (-1); - vl.values = values; - vl.values_len = 1; - - if ((strncmp ("unix:", daemon_address, strlen ("unix:")) == 0) - || (daemon_address[0] == '/')) - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - else + if ((strncmp ("unix:", daemon_address, strlen ("unix:")) != 0) + && (daemon_address[0] != '/')) sstrncpy (vl.host, daemon_address, sizeof (vl.host)); sstrncpy (vl.plugin, "rrdcached", sizeof (vl.plugin)); @@ -330,9 +326,9 @@ static int rc_read (void) for (rrdc_stats_t *ptr = head; ptr != NULL; ptr = ptr->next) { if (ptr->type == RRDC_STATS_TYPE_GAUGE) - values[0].gauge = (gauge_t) ptr->value.gauge; + vl.values[0].gauge = (gauge_t) ptr->value.gauge; else if (ptr->type == RRDC_STATS_TYPE_COUNTER) - values[0].counter = (counter_t) ptr->value.counter; + vl.values[0].counter = (counter_t) ptr->value.counter; else continue;