X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmultimeter.c;h=775eb57e27bff64201f81e83cf6528c36fa0608e;hb=HEAD;hp=11ca42c1f6fd1dcda1c7dacb57754f7b33f8c8e7;hpb=58ecdb7ff9a4d90e87daecca05b9cb4a43070fd7;p=collectd.git

diff --git a/src/multimeter.c b/src/multimeter.c
index 11ca42c1..775eb57e 100644
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -36,26 +36,6 @@
 
 static int fd = -1;
 
-static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
-                struct timeval *res)
-{
-        if ((tv1->tv_sec < tv2->tv_sec) ||
-	    ((tv1->tv_sec == tv2->tv_sec) && (tv1->tv_usec < tv2->tv_usec)))
-    	        return (-1);
-
-        res->tv_sec  = tv1->tv_sec  - tv2->tv_sec;
-        res->tv_usec = tv1->tv_usec - tv2->tv_usec;
-
-        assert ((res->tv_sec > 0) || ((res->tv_sec == 0) && (res->tv_usec > 0)));
-
-        while (res->tv_usec < 0)
-        {
-	        res->tv_usec += 1000000;
-                res->tv_sec--;
-        }
-	return (0);
-}
-
 #define LINE_LENGTH 14
 static int multimeter_read_value(double *value)
 {
@@ -86,7 +66,12 @@ static int multimeter_read_value(double *value)
     			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);
@@ -100,7 +85,7 @@ static int multimeter_read_value(double *value)
 							sizeof (errbuf)));
 	                        return (-1);
 	                }
-			if (multimeter_timeval_sub (&time_end, &time_now, &timeout) == -1)
+			if (timeval_cmp (time_end, time_now, &timeout) < 0)
 	                        break;
 
 			status = select(fd+1, &rfds, NULL, NULL, &timeout);
@@ -215,11 +200,11 @@ static void multimeter_submit (double value)
 
 	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)