X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgps.c;h=644967b3b7ec79c2bc4e2c977138dd34086041b3;hb=a9f509bacfda6be6882527a16563f260e4373246;hp=e43af4a4e55b2256af5846f81c3f0a8d9f157ef4;hpb=7c14b05db2cd7b17321f1e37bfb852c1a9a3832d;p=collectd.git diff --git a/src/gps.c b/src/gps.c index e43af4a4..644967b3 100644 --- a/src/gps.c +++ b/src/gps.c @@ -30,7 +30,6 @@ #include "common.h" #include "plugin.h" #include "utils_time.h" -#include "configfile.h" #define CGPS_TRUE 1 #define CGPS_FALSE 0 @@ -221,14 +220,10 @@ quit: */ static void cgps_submit (const char *type, gauge_t value, const char *type_instance) { - 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, "gps", sizeof (vl.plugin)); sstrncpy (vl.type, type, sizeof (vl.type)); sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); @@ -239,7 +234,7 @@ static void cgps_submit (const char *type, gauge_t value, const char *type_insta /** * Read the data and submit by piece. */ -static int cgps_read () +static int cgps_read (void) { cgps_data_t data_copy; @@ -285,14 +280,14 @@ static int cgps_config (oconfig_item_t *ci) cgps_config_data.timeout > TIME_T_TO_CDTIME_T(5) || cgps_config_data.timeout < US_TO_CDTIME_T(500) - ) + ) { - WARNING ("gps plugin: timeout set to %.6f sec. setting to default (%.6f).", + WARNING ("gps plugin: timeout set to %.6f sec. setting to default (%.6f).", CDTIME_T_TO_DOUBLE(cgps_config_data.timeout), CDTIME_T_TO_DOUBLE(CGPS_DEFAULT_TIMEOUT) ); cgps_config_data.timeout = CGPS_DEFAULT_TIMEOUT; - } + } return (0); }