projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
sensors.c
diff --git
a/src/sensors.c
b/src/sensors.c
index
f4ecda5
..
33982e0
100644
(file)
--- a/
src/sensors.c
+++ b/
src/sensors.c
@@
-149,7
+149,7
@@
typedef struct featurelist {
static char *conffile = SENSORS_CONF_PATH;
/* #endif SENSORS_API_VERSION < 0x400 */
static char *conffile = SENSORS_CONF_PATH;
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400)
&& (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
typedef struct featurelist {
const sensors_chip_name *chip;
const sensors_feature *feature;
typedef struct featurelist {
const sensors_chip_name *chip;
const sensors_feature *feature;
@@
-159,11
+159,6
@@
typedef struct featurelist {
static char *conffile = NULL;
static _Bool use_labels = 0;
static char *conffile = NULL;
static _Bool use_labels = 0;
-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-
-#else /* if SENSORS_API_VERSION >= 0x500 */
-#error "This version of libsensors is not supported yet. Please report this " \
- "as bug."
#endif
static featurelist_t *first_feature = NULL;
#endif
static featurelist_t *first_feature = NULL;
@@
-223,7
+218,7
@@
static int sensors_config(const char *key, const char *value) {
if (IS_TRUE(value))
ignorelist_set_invert(sensor_list, 0);
}
if (IS_TRUE(value))
ignorelist_set_invert(sensor_list, 0);
}
-#if (SENSORS_API_VERSION >= 0x400)
&& (SENSORS_API_VERSION < 0x500)
+#if (SENSORS_API_VERSION >= 0x400)
else if (strcasecmp(key, "UseLabels") == 0) {
use_labels = IS_TRUE(value) ? 1 : 0;
}
else if (strcasecmp(key, "UseLabels") == 0) {
use_labels = IS_TRUE(value) ? 1 : 0;
}
@@
-353,7
+348,7
@@
static int sensors_load_conf(void) {
} /* while sensors_get_detected_chips */
/* #endif SENSORS_API_VERSION < 0x400 */
} /* while sensors_get_detected_chips */
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400)
&& (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
chip_num = 0;
while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
const sensors_feature *feature;
chip_num = 0;
while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
const sensors_feature *feature;
@@
-410,7
+405,7
@@
static int sensors_load_conf(void) {
} /* while (subfeature) */
} /* while (feature) */
} /* while (chip) */
} /* while (subfeature) */
} /* while (feature) */
} /* while (chip) */
-#endif /* (SENSORS_API_VERSION >= 0x400)
&& (SENSORS_API_VERSION < 0x500)
*/
+#endif /* (SENSORS_API_VERSION >= 0x400) */
if (first_feature == NULL) {
sensors_cleanup();
if (first_feature == NULL) {
sensors_cleanup();
@@
-485,7
+480,7
@@
static int sensors_read(void) {
} /* for fl = first_feature .. NULL */
/* #endif SENSORS_API_VERSION < 0x400 */
} /* for fl = first_feature .. NULL */
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400)
&& (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
double value;
int status;
for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
double value;
int status;
@@
-528,7
+523,7
@@
static int sensors_read(void) {
sensors_submit(plugin_instance, type, type_instance, value);
} /* for fl = first_feature .. NULL */
sensors_submit(plugin_instance, type, type_instance, value);
} /* for fl = first_feature .. NULL */
-#endif /* (SENSORS_API_VERSION >= 0x400)
&& (SENSORS_API_VERSION < 0x500)
*/
+#endif /* (SENSORS_API_VERSION >= 0x400) */
return 0;
} /* int sensors_read */
return 0;
} /* int sensors_read */