X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmultimeter.c;h=994747f94f4167c352febc69c8ca4eb884c28650;hb=fd9c88963b04c9e9050a952ba0f018493e8b7638;hp=02abfc8a9f8d33768577ac59257af6870cebc7d6;hpb=06adec208286b5a136ffa5c5f3832c35e9f62844;p=collectd.git

diff --git a/src/multimeter.c b/src/multimeter.c
index 02abfc8a..994747f9 100644
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -30,23 +30,10 @@
 # include <termios.h>
 # include <sys/ioctl.h>
 # include <math.h>
-# define MULTIMETER_HAVE_READ 1
 #else
-# define MULTIMETER_HAVE_READ 0
-# error "multimeter cannot read!"
+# error "No applicable input method."
 #endif
 
-static data_source_t data_source[1] =
-{
-	{"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t data_set =
-{
-	"multimeter", 1, data_source
-};
-
-#if MULTIMETER_HAVE_READ
 static int fd = -1;
 
 static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
@@ -68,6 +55,7 @@ static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
         }
 	return (0);
 }
+
 #define LINE_LENGTH 14
 static int multimeter_read_value(double *value)
 {
@@ -228,10 +216,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)
@@ -258,19 +247,10 @@ static int multimeter_shutdown (void)
 
 	return (0);
 }
-#endif /* MULTIMETER_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-		plugin_register_data_set (&data_set);
-
-#if MULTIMETER_HAVE_READ
-	if (load & MR_READ)
-	{
-		plugin_register_init ("multimeter", multimeter_init);
-		plugin_register_read ("multimeter", multimeter_read);
-		plugin_register_shutdown ("multimeter", multimeter_shutdown);
-	}
-#endif /* MULTIMETER_HAVE_READ */
+	plugin_register_init ("multimeter", multimeter_init);
+	plugin_register_read ("multimeter", multimeter_read);
+	plugin_register_shutdown ("multimeter", multimeter_shutdown);
 } /* void module_register */