Merge branch 'pull/collectd-4' into collectd-4

[collectd.git] / src / sensors.c

diff --git a/src/sensors.c b/src/sensors.c
index 544afd1..551d267 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -153,9 +153,9 @@ static sensors_labeltypes_t known_features[] =
        { "3.3V", SENSOR_TYPE_VOLTAGE },
        { "2.5V", SENSOR_TYPE_VOLTAGE },
        { "2.0V", SENSOR_TYPE_VOLTAGE },
-       { "12V", SENSOR_TYPE_VOLTAGE },
-       { (char *) 0, SENSOR_TYPE_UNKNOWN }
+       { "12V", SENSOR_TYPE_VOLTAGE }
 };
+static int known_features_num = STATIC_ARRAY_SIZE (known_features);
 /* end new naming */
 
 static const char *config_keys[] =
@@ -310,7 +310,7 @@ static void sensors_load_conf (void)
                                continue;
 
                        /* Only known features */
-                       for (i = 0; known_features[i].type >= 0; i++)
+                       for (i = 0; i < known_features_num; i++)
                        {
                                if (strcmp (data->name, known_features[i].label) != 0)
                                        continue;
@@ -377,7 +377,8 @@ static void sensors_submit (const char *plugin_instance,
        value_t values[1];
        value_list_t vl = VALUE_LIST_INIT;
 
-       if (ignorelist_match (sensor_list, type_instance))
+       if ((sensor_list != NULL)
+                       && (ignorelist_match (sensor_list, type_instance)))
                return;
 
        values[0].gauge = val;
@@ -448,16 +449,22 @@ static int sensors_read (void)
 } /* int sensors_read */
 #endif /* SENSORS_HAVE_READ */
 
-void module_register (void)
+void module_register (modreg_e load)
 {
-       plugin_register_data_set (&fanspeed_ds);
-       plugin_register_data_set (&temperature_ds);
-       plugin_register_data_set (&voltage_ds);
+       if (load & MR_DATASETS)
+       {
+               plugin_register_data_set (&fanspeed_ds);
+               plugin_register_data_set (&temperature_ds);
+               plugin_register_data_set (&voltage_ds);
+       }
 
 #if SENSORS_HAVE_READ
-       plugin_register_config ("sensors", sensors_config,
-                       config_keys, config_keys_num);
-       plugin_register_read ("sensors", sensors_read);
-       plugin_register_shutdown ("sensors", sensors_shutdown);
+       if (load & MR_READ)
+       {
+               plugin_register_config ("sensors", sensors_config,
+                               config_keys, config_keys_num);
+               plugin_register_read ("sensors", sensors_read);
+               plugin_register_shutdown ("sensors", sensors_shutdown);
+       }
 #endif
 } /* void module_register */