X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fted.c;h=001eddf42aede512fd285b045145d52bd95a48d8;hb=41288c6a9ed050b41ad47184aa1b53668c3588cc;hp=282212b114f0c1832a4401663825aebf0678715c;hpb=362a519e00d50fc3657d485135075f753ec71bab;p=collectd.git diff --git a/src/ted.c b/src/ted.c index 282212b1..001eddf4 100644 --- a/src/ted.c +++ b/src/ted.c @@ -35,9 +35,9 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#include "configfile.h" #if HAVE_TERMIOS_H && HAVE_SYS_IOCTL_H && HAVE_MATH_H # include @@ -107,7 +107,6 @@ static int ted_read_value(double *ret_power, double *ret_voltage) while (end_flag == 0) { ssize_t receive_buffer_length; - ssize_t i; /* check for timeout or input error*/ status = select (fd + 1, &input, NULL, NULL, &timeout); @@ -164,7 +163,7 @@ static int ted_read_value(double *ret_power, double *ret_voltage) * the beginning of the package has been found. */ escape_flag = 0; - for (i = 0; i < receive_buffer_length; i++) + for (ssize_t i = 0; i < receive_buffer_length; i++) { /* Check if previous byte was the escape byte. */ if (escape_flag == 1) @@ -264,14 +263,10 @@ static int ted_open_device (void) static void ted_submit (const char *type, double 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, "ted", sizeof (vl.plugin)); sstrncpy (vl.type, type, sizeof (vl.type)); @@ -311,7 +306,6 @@ static int ted_read (void) double power; double voltage; int status; - int i; status = ted_open_device (); if (status != 0) @@ -319,7 +313,7 @@ static int ted_read (void) power = NAN; voltage = NAN; - for (i = 0; i <= conf_retries; i++) + for (int i = 0; i <= conf_retries; i++) { status = ted_read_value (&power, &voltage); if (status == 0)