Merged revisions 495:504, 508:509 and 510:513 from `trunk' to `tags/collectd-3.8.1'

[collectd.git] / src / sensors.c

diff --git a/src/sensors.c b/src/sensors.c
index 1313963..75981e8 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -38,6 +38,8 @@
 # define SENSORS_HAVE_READ 0
 #endif
 
+#define BUFSIZE 512
+
 static char *filename_format = "sensors-%s.rrd";
 
 static char *ds_def[] =
@@ -147,7 +149,6 @@ static void collectd_sensors_init (void)
        return;
 }
 
-#define BUFSIZE 512
 static void sensors_write (char *host, char *inst, char *val)
 {
        char file[BUFSIZE];
@@ -162,6 +163,7 @@ static void sensors_write (char *host, char *inst, char *val)
        rrd_update_file (host, file, val, ds_def, ds_num);
 }
 
+#if SENSORS_HAVE_READ
 static void sensors_submit (const char *feat_name, const char *chip_prefix, double value)
 {
        char buf[BUFSIZE];
@@ -175,9 +177,7 @@ static void sensors_submit (const char *feat_name, const char *chip_prefix, doub
 
        plugin_submit (MODULE_NAME, inst, buf);
 }
-#undef BUFSIZE
 
-#if SENSORS_HAVE_READ
 static void sensors_read (void)
 {
        featurelist_t *feature;
@@ -191,17 +191,14 @@ static void sensors_read (void)
                sensors_submit (feature->data->name, feature->chip->prefix, value);
        }
 }
+#else
+# define sensors_read NULL
 #endif /* SENSORS_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register (MODULE_NAME, collectd_sensors_init,
-#if SENSORS_HAVE_READ
-                       sensors_read,
-#else
-                       NULL,
-#endif
-                       sensors_write);
+       plugin_register (MODULE_NAME, collectd_sensors_init, sensors_read, sensors_write);
 }
 
+#undef BUFSIZE
 #undef MODULE_NAME