X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fted.c;h=21d6357b16744fae13849fab05d2103ada747891;hb=a396da422740caf336a6d594515e8d80de6f440a;hp=94b4e3ab4b6dc9112282969b509d852627dbad74;hpb=307c875e5a78a2729fbbe1a588d232e9a129d75a;p=collectd.git diff --git a/src/ted.c b/src/ted.c index 94b4e3ab..21d6357b 100644 --- a/src/ted.c +++ b/src/ted.c @@ -53,7 +53,7 @@ #define DEFAULT_DEVICE "/dev/ttyUSB0" -static char *conf_device = NULL; +static char *conf_device; static int conf_retries = 0; static int fd = -1; @@ -88,7 +88,7 @@ static int ted_read_value(double *ret_power, double *ret_voltage) { status = write(fd, pkt_request, sizeof(pkt_request)); if (status <= 0) { - ERROR("ted plugin: swrite failed."); + ERROR("ted plugin: write failed."); return -1; } @@ -109,19 +109,15 @@ static int ted_read_value(double *ret_power, double *ret_voltage) { /* Some signal or something. Start over.. */ continue; } else if (status < 0) { - char errbuf[1024]; - ERROR("ted plugin: select failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("ted plugin: select failed: %s", STRERRNO); return -1; } receive_buffer_length = read(fd, receive_buffer, sizeof(receive_buffer)); if (receive_buffer_length < 0) { - char errbuf[1024]; if ((errno == EAGAIN) || (errno == EINTR)) continue; - ERROR("ted plugin: read(2) failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("ted plugin: read(2) failed: %s", STRERRNO); return -1; } else if (receive_buffer_length == 0) { /* Should we close the FD in this case? */