Merge branch 'ff/apcups' into collectd-4.0

[collectd.git] / src / multimeter.c

diff --git a/src/multimeter.c b/src/multimeter.c
index 04196bb..21a2144 100644 (file)
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -36,16 +36,6 @@
 # error "multimeter cannot read!"
 #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;
 
@@ -81,8 +71,10 @@ static int multimeter_read_value(double *value)
 
                if (gettimeofday (&time_end, NULL) < 0)
                {
+                       char errbuf[1024];
                        ERROR ("multimeter plugin: gettimeofday failed: %s",
-                                strerror (errno));
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        return (-1);
                }
                time_end.tv_sec++;      
@@ -103,9 +95,11 @@ static int multimeter_read_value(double *value)
 
                        if (gettimeofday (&time_now, NULL) < 0)
                        {
+                               char errbuf[1024];
                                ERROR ("multimeter plugin: "
                                                "gettimeofday failed: %s",
-                                               strerror (errno));
+                                               sstrerror (errno, errbuf,
+                                                       sizeof (errbuf)));
                                return (-1);
                        }
                        if (multimeter_timeval_sub (&time_end, &time_now, &timeout) == -1)
@@ -157,9 +151,10 @@ static int multimeter_read_value(double *value)
                        }
                        else /* status == -1 */
                        {
+                               char errbuf[1024];
                                ERROR ("multimeter plugin: "
                                                "select failed: %s",
-                                               strerror (errno));
+                                               sstrerror (errno, errbuf, sizeof (errbuf)));
                                break;
                        }
                }
@@ -257,11 +252,9 @@ static int multimeter_shutdown (void)
 
 void module_register (void)
 {
-       plugin_register_data_set (&data_set);
-
 #if MULTIMETER_HAVE_READ
        plugin_register_init ("multimeter", multimeter_init);
        plugin_register_read ("multimeter", multimeter_read);
        plugin_register_shutdown ("multimeter", multimeter_shutdown);
 #endif /* MULTIMETER_HAVE_READ */
-}
+} /* void module_register */