X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fchrony.c;h=11310b192773b2296f90389b2378d7d2ebd78ae2;hb=6c97677d92ee28bf35dfe7b2c30b348fe8d2848b;hp=bf4da4a5de64206ce1516dcb6868015c5211bb1b;hpb=79963d13c1884d1d92667cc502ad20758b084a12;p=collectd.git diff --git a/src/chrony.c b/src/chrony.c index bf4da4a5..11310b19 100644 --- a/src/chrony.c +++ b/src/chrony.c @@ -598,21 +598,13 @@ static double ntohf(tFloat p_float) { static void chrony_push_data(const char *p_type, const char *p_type_inst, double p_value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = - p_value; /* TODO: Check type??? (counter, gauge, derive, absolute) */ - - vl.values = values; + vl.values = &(value_t){.gauge = p_value}; vl.values_len = 1; /* XXX: Shall g_chrony_host/g_chrony_port be reflected in the plugin's output? */ - /* hostname_g is set in daemon/collectd.c (from config, via gethostname or by - * resolving localhost) */ - /* defined as: char hostname_g[DATA_MAX_NAME_LEN]; (never NULL) */ - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); sstrncpy(vl.plugin, PLUGIN_NAME_SHORT, sizeof(vl.plugin)); if (g_chrony_plugin_instance != NULL) { sstrncpy(vl.plugin_instance, g_chrony_plugin_instance, @@ -786,10 +778,9 @@ static int chrony_request_daemon_stats(void) { chrony_push_data("time_ref", DAEMON_NAME, time_ref); /* unit: s */ chrony_push_data( "time_offset_ntp", DAEMON_NAME, - ntohf( - chrony_resp.body.tracking.f_current_correction)); /* Offset between - system time and - NTP, unit: s */ + ntohf(chrony_resp.body.tracking.f_current_correction)); /* Offset between + system time and + NTP, unit: s */ chrony_push_data( "time_offset", DAEMON_NAME, ntohf( @@ -807,10 +798,9 @@ static int chrony_request_daemon_stats(void) { ntohf(chrony_resp.body.tracking.f_skew_ppm)); chrony_push_data( "root_delay", DAEMON_NAME, - ntohf( - chrony_resp.body.tracking.f_root_delay)); /* Network latency between - local daemon and the - current source */ + ntohf(chrony_resp.body.tracking.f_root_delay)); /* Network latency between + local daemon and the + current source */ chrony_push_data("root_dispersion", DAEMON_NAME, ntohf(chrony_resp.body.tracking.f_root_dispersion)); chrony_push_data("clock_last_update", DAEMON_NAME,