projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2807 from sileht/master
[collectd.git]
/
src
/
multimeter.c
diff --git
a/src/multimeter.c
b/src/multimeter.c
index
93ab3d2
..
ca9b15d
100644
(file)
--- a/
src/multimeter.c
+++ b/
src/multimeter.c
@@
-46,10
+46,8
@@
static int multimeter_read_value(double *value) {
tcflush(fd, TCIFLUSH);
if (gettimeofday(&time_end, NULL) < 0) {
tcflush(fd, TCIFLUSH);
if (gettimeofday(&time_end, NULL) < 0) {
- char errbuf[1024];
- ERROR("multimeter plugin: gettimeofday failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ ERROR("multimeter plugin: gettimeofday failed: %s", STRERRNO);
+ return -1;
}
time_end.tv_sec++;
}
time_end.tv_sec++;
@@
-62,20
+60,19
@@
static int multimeter_read_value(double *value) {
struct timeval time_now;
status = swrite(fd, "D", 1);
struct timeval time_now;
status = swrite(fd, "D", 1);
- if (status
<
0) {
+ if (status
!=
0) {
ERROR("multimeter plugin: swrite failed.");
ERROR("multimeter plugin: swrite failed.");
- return
(-1)
;
+ return
-1
;
}
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
if (gettimeofday(&time_now, NULL) < 0) {
}
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
if (gettimeofday(&time_now, NULL) < 0) {
- char errbuf[1024];
ERROR("multimeter plugin: "
"gettimeofday failed: %s",
ERROR("multimeter plugin: "
"gettimeofday failed: %s",
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
- return
(-1)
;
+
STRERRNO
);
+ return
-1
;
}
if (timeval_cmp(time_end, time_now, &timeout) < 0)
break;
}
if (timeval_cmp(time_end, time_now, &timeout) < 0)
break;
@@
-120,9
+117,9
@@
static int multimeter_read_value(double *value) {
break;
}
} else
break;
}
} else
- return
(-1)
; /* Overflow */
+ return
-1
; /* Overflow */
- return
(0)
; /* value received */
+ return
0
; /* value received */
} else
break;
} else if (!status) /* Timeout */
} else
break;
} else if (!status) /* Timeout */
@@
-132,16
+129,15
@@
static int multimeter_read_value(double *value) {
continue;
} else /* status == -1 */
{
continue;
} else /* status == -1 */
{
- char errbuf[1024];
ERROR("multimeter plugin: "
"select failed: %s",
ERROR("multimeter plugin: "
"select failed: %s",
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
break;
}
}
} while (--retry);
break;
}
}
} while (--retry);
- return
(-2)
; /* no value received */
+ return
-2
; /* no value received */
} /* int multimeter_read_value */
static int multimeter_init(void) {
} /* int multimeter_read_value */
static int multimeter_init(void) {
@@
-173,13
+169,13
@@
static int multimeter_init(void) {
INFO("multimeter plugin: Device "
"found at %s",
device);
INFO("multimeter plugin: Device "
"found at %s",
device);
- return
(0)
;
+ return
0
;
}
}
}
ERROR("multimeter plugin: No device found");
}
}
}
ERROR("multimeter plugin: No device found");
- return
(-1)
;
+ return
-1
;
}
#undef LINE_LENGTH
}
#undef LINE_LENGTH
@@
-198,13
+194,13
@@
static int multimeter_read(void) {
double value;
if (fd < 0)
double value;
if (fd < 0)
- return
(-1)
;
+ return
-1
;
if (multimeter_read_value(&value) != 0)
if (multimeter_read_value(&value) != 0)
- return
(-1)
;
+ return
-1
;
multimeter_submit(value);
multimeter_submit(value);
- return
(0)
;
+ return
0
;
} /* int multimeter_read */
static int multimeter_shutdown(void) {
} /* int multimeter_read */
static int multimeter_shutdown(void) {
@@
-213,7
+209,7
@@
static int multimeter_shutdown(void) {
fd = -1;
}
fd = -1;
}
- return
(0)
;
+ return
0
;
}
void module_register(void) {
}
void module_register(void) {