X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fmultimeter.c;h=5a7d5a2a60c3d49bf610ab05ac81c5129693b786;hp=fc69e02dd4ac1aff8fa4a19e4e7eb199c1212bca;hb=48efd3deb4c9139fd060ff3d289896e9031bcc7c;hpb=1159cb5d383c55a80a0db100b8f7aadcf44740a5 diff --git a/src/multimeter.c b/src/multimeter.c index fc69e02d..5a7d5a2a 100644 --- a/src/multimeter.c +++ b/src/multimeter.c @@ -24,8 +24,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #if HAVE_TERMIOS_H && HAVE_SYS_IOCTL_H #include @@ -46,9 +46,7 @@ static int multimeter_read_value(double *value) { tcflush(fd, TCIFLUSH); if (gettimeofday(&time_end, NULL) < 0) { - char errbuf[1024]; - ERROR("multimeter plugin: gettimeofday failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("multimeter plugin: gettimeofday failed: %s", STRERRNO); return -1; } time_end.tv_sec++; @@ -71,10 +69,9 @@ static int multimeter_read_value(double *value) { FD_SET(fd, &rfds); if (gettimeofday(&time_now, NULL) < 0) { - char errbuf[1024]; ERROR("multimeter plugin: " "gettimeofday failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); return -1; } if (timeval_cmp(time_end, time_now, &timeout) < 0) @@ -132,10 +129,9 @@ static int multimeter_read_value(double *value) { continue; } else /* status == -1 */ { - char errbuf[1024]; ERROR("multimeter plugin: " "select failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); break; } }