projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bp/bind'
[collectd.git]
/
src
/
multimeter.c
diff --git
a/src/multimeter.c
b/src/multimeter.c
index
11ca42c
..
9c9c2c1
100644
(file)
--- a/
src/multimeter.c
+++ b/
src/multimeter.c
@@
-86,7
+86,12
@@
static int multimeter_read_value(double *value)
struct timeval timeout;
struct timeval time_now;
struct timeval timeout;
struct timeval time_now;
- write(fd, "D", 1);
+ status = swrite (fd, "D", 1);
+ if (status < 0)
+ {
+ ERROR ("multimeter plugin: swrite failed.");
+ return (-1);
+ }
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
@@
-216,10
+221,11
@@
static void multimeter_submit (double value)
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname_g);
- strcpy (vl.plugin, "multimeter");
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "multimeter", sizeof (vl.plugin));
+ sstrncpy (vl.type, "multimeter", sizeof (vl.type));
- plugin_dispatch_values (
"multimeter",
&vl);
+ plugin_dispatch_values (&vl);
}
static int multimeter_read (void)
}
static int multimeter_read (void)