X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fserial.c;h=fda878706621a83ea5d7bee1cca77908a8884deb;hb=8fd8f76dc11064e75e44448d16d35e09e46191a2;hp=10396fcf144ef52def61438a113cd12cde8c27c4;hpb=2079ee1517e34de372f58e7e2267ad5c71a8a41f;p=collectd.git diff --git a/src/serial.c b/src/serial.c index 10396fcf..fda87870 100644 --- a/src/serial.c +++ b/src/serial.c @@ -31,15 +31,13 @@ #endif static void serial_submit(const char *type_instance, derive_t rx, derive_t tx) { - value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - - values[0].derive = rx; - values[1].derive = tx; + value_t values[] = { + {.derive = rx}, {.derive = tx}, + }; vl.values = values; - vl.values_len = 2; - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); + vl.values_len = STATIC_ARRAY_SIZE(values); sstrncpy(vl.plugin, "serial", sizeof(vl.plugin)); sstrncpy(vl.type, "serial_octets", sizeof(vl.type)); sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); @@ -56,7 +54,7 @@ static int serial_read(void) { (fh = fopen("/proc/tty/driver/ttyS", "r")) == NULL) { char errbuf[1024]; WARNING("serial: fopen: %s", sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + return -1; } while (fgets(buffer, sizeof(buffer), fh) != NULL) { @@ -102,7 +100,7 @@ static int serial_read(void) { } fclose(fh); - return (0); + return 0; } /* int serial_read */ void module_register(void) {