diff --git a/src/sensors.c b/src/sensors.c
index c60f2914e1d32e793c314aaf0909a8907d5feea6..7cf787c7a8b155b9a74f1398a2e4c550f42372bc 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
#include "common.h"
#include "plugin.h"
#include "configfile.h"
-#include "config_list.h"
+#include "utils_ignorelist.h"
#include "utils_debug.h"
#define MODULE_NAME "sensors"
#define SENSOR_TYPE_FANSPEED 2
#define SENSOR_TYPE_TEMPERATURE 3
+#if SENSORS_HAVE_READ
static char *sensor_type_prefix[] =
{
"unknown",
"temperature",
NULL
};
+#endif
typedef struct sensors_labeltypes {
char *label;
/*
* finite list of known labels extracted from lm_sensors
*/
+#if SENSORS_HAVE_READ
static sensors_labeltypes known_features[] =
{
{ "fan1", SENSOR_TYPE_FANSPEED },
{ "12V", SENSOR_TYPE_VOLTAGE },
{ 0, -1 }
};
+#endif
/* end new naming */
static char *config_keys[] =
};
static int config_keys_num = 3;
-static configlist_t *sensor_list;
+static ignorelist_t *sensor_list;
/*
* sensor_extended_naming:
static int sensors_config (char *key, char *value)
{
if (sensor_list == NULL)
- sensor_list = configlist_init();
+ sensor_list = ignorelist_create (1);
if (strcasecmp (key, "Sensor") == 0)
{
- if (!configlist_add (sensor_list, value))
+ if (ignorelist_add (sensor_list, value))
{
- syslog (LOG_EMERG, "Cannot add value.");
+ syslog (LOG_EMERG, "Cannot add value to ignorelist.");
return (1);
}
}
else if (strcasecmp (key, "IgnoreSelected") == 0)
{
+ ignorelist_set_invert (sensor_list, 1);
if ((strcasecmp (value, "True") == 0)
|| (strcasecmp (value, "Yes") == 0)
|| (strcasecmp (value, "On") == 0))
- configlist_ignore (sensor_list, 1);
+ ignorelist_set_invert (sensor_list, 0);
}
else if (strcasecmp (key, "ExtendedSensorNaming") == 0)
{
int status;
/* skip ignored in our config */
- if (configlist_ignored (sensor_list, inst))
+ if (ignorelist_match (sensor_list, inst))
return;
/* extended sensor naming */
int status;
/* skip ignored in our config */
- if (configlist_ignored (sensor_list, inst))
+ if (ignorelist_match (sensor_list, inst))
return;
/* extended sensor naming */
return;
/* skip ignored in our config */
- if (configlist_ignored (sensor_list, inst))
+ if (ignorelist_match (sensor_list, inst))
return;
if (snprintf (buf, BUFSIZE, "%u:%.3f", (unsigned int) curtime,