normalize and cleanup

[psensor.git] / src / lib / psensor.c

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 1efff09..653b1b2 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -25,7 +25,6 @@
 
 #include <hdd.h>
 #include <psensor.h>
-#include <lmsensor.h>
 #include <temperature.h>
 
 struct psensor *psensor_create(char *id,
@@ -413,26 +412,16 @@ double get_max_temp(struct psensor **sensors)
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 {
        struct psensor **psensors;
-       struct psensor **tmp_psensors;
 
-       psensors = lmsensor_psensor_list_add(NULL, values_max_length);
+       psensors = NULL;
+
+       if (!use_libatasmart)
+               hddtemp_psensor_list_append(&psensors, values_max_length);
 
-       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;
-                       }
+                       atasmart_psensor_list_append(&psensors,
+                                                    values_max_length);
                }
 #endif
 
@@ -511,14 +500,12 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 
 void psensor_list_update_measures(struct psensor **sensors)
 {
-       lmsensor_psensor_list_update(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);
+               atasmart_psensor_list_update(sensors);
 #endif
 }
 
@@ -536,12 +523,10 @@ void psensor_log_measures(struct psensor **sensors)
 
 void psensor_init()
 {
-       lmsensor_init();
 }
 
 void psensor_cleanup()
 {
-       lmsensor_cleanup();
 }
 
 struct psensor **psensor_list_copy(struct psensor **sensors)