X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=8a1d443cafda8d67822223b48dfd6db9f47ab0c1;hb=7cf47f8e660b7a2306565d8e744ad2de62cce402;hp=cd7fcf622c349ba4eb72e9dcb49b004922c44bca;hpb=2291a5e288aab0c29e2886ae2e60aa254d698e0e;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index cd7fcf6..8a1d443 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -155,21 +155,18 @@ int psensor_list_size(struct psensor **sensors)
 	return size;
 }
 
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
+bool psensor_list_contains_type(struct psensor **sensors, unsigned int type)
 {
-	struct psensor **s;
-
 	if (!sensors)
-		return 0;
+		return false;
 
-	s = sensors;
-	while (*s) {
-		if ((*s)->type & type)
-			return 1;
-		s++;
+	while (*sensors) {
+		if (((*sensors)->type & type) == type)
+			return true;
+		sensors++;
 	}
 
-	return 0;
+	return false;
 }
 
 struct psensor **psensor_list_add(struct psensor **sensors,
@@ -409,40 +406,6 @@ double get_max_temp(struct psensor **sensors)
 	return get_max_value(sensors, SENSOR_TYPE_TEMP);
 }
 
-struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
-{
-	struct psensor **psensors;
-	struct psensor **tmp_psensors;
-
-	psensors = NULL;
-
-	if (!use_libatasmart) {
-		tmp_psensors = hddtemp_psensor_list_add(psensors,
-							values_max_length);
-		if (tmp_psensors != psensors) {
-			free(psensors);
-			psensors = tmp_psensors;
-		}
-	}
-#ifdef HAVE_ATASMART
-		else {
-			tmp_psensors = hdd_psensor_list_add(psensors,
-							    values_max_length);
-			if (tmp_psensors != psensors) {
-				free(psensors);
-				psensors = tmp_psensors;
-			}
-		}
-#endif
-
-	if (!psensors) {	/* there is no detected sensors */
-		psensors = malloc(sizeof(struct psensor *));
-		*psensors = NULL;
-	}
-
-	return psensors;
-}
-
 const char *psensor_type_to_str(unsigned int type)
 {
 	if (type & SENSOR_TYPE_NVCTRL) {
@@ -508,17 +471,6 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 	return _("N/A");
 }
 
-void psensor_list_update_measures(struct psensor **sensors)
-{
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
-		hddtemp_psensor_list_update(sensors);
-
-#ifdef HAVE_ATASMART
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART))
-		hdd_psensor_list_update(sensors);
-#endif
-}
-
 void psensor_log_measures(struct psensor **sensors)
 {
 	if (log_level == LOG_DEBUG)
@@ -531,14 +483,6 @@ void psensor_log_measures(struct psensor **sensors)
 		}
 }
 
-void psensor_init()
-{
-}
-
-void psensor_cleanup()
-{
-}
-
 struct psensor **psensor_list_copy(struct psensor **sensors)
 {
 	struct psensor **result;