cleanup and normalize

diff --git a/src/lib/hdd.h b/src/lib/hdd.h
index 6c79dbc..f7cbeb6 100644 (file)
--- a/src/lib/hdd.h
+++ b/src/lib/hdd.h
@@ -23,10 +23,8 @@
 #include "psensor.h"
 
 #ifdef HAVE_ATASMART
-struct psensor **hdd_psensor_list_add(struct psensor **sensors,
-                                     int values_max_length);
-
-void hdd_psensor_list_update(struct psensor **sensors);
+void atasmart_psensor_list_append(struct psensor ***sensors, int values_length);
+void atasmart_psensor_list_update(struct psensor **sensors);
 #endif
 
 struct psensor **hddtemp_psensor_list_add(struct psensor **sensors,

diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c
index 051e09c..0fd7d5d 100644 (file)
--- a/src/lib/hdd_atasmart.c
+++ b/src/lib/hdd_atasmart.c
@@ -109,18 +109,17 @@ static void analyze_disk(const char *dname)
        close(f);
 }
 
-struct psensor **hdd_psensor_list_add(struct psensor **sensors,
-                                     int values_max_length)
+void
+atasmart_psensor_list_append(struct psensor ***sensors, int values_max_length)
 {
        char **paths, **tmp, *id;
        SkDisk *disk;
-       struct psensor *sensor, **tmp_sensors, **result;
+       struct psensor *sensor;
 
        log_fct_enter();
 
        paths = dir_list("/dev", filter_sd);
 
-       result = sensors;
        tmp = paths;
        while (*tmp) {
                log_fct("Open %s", *tmp);
@@ -137,12 +136,7 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
                                               disk,
                                               values_max_length);
 
-                       tmp_sensors = psensor_list_add(result, sensor);
-
-                       if (result != sensors)
-                               free(result);
-
-                       result = tmp_sensors;
+                       psensor_list_append(sensors, sensor);
                } else {
                        log_err(_("%s: sk_disk_open() failure: %s."),
                                PROVIDER_NAME,
@@ -156,11 +150,9 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
        paths_free(paths);
 
        log_fct_exit();
-
-       return result;
 }
 
-void hdd_psensor_list_update(struct psensor **sensors)
+void atasmart_psensor_list_update(struct psensor **sensors)
 {
        struct psensor **cur, *s;
        uint64_t kelvin;

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index cd7fcf6..f4b01b2 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -426,12 +426,8 @@ struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
        }
 #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
 
@@ -515,7 +511,7 @@ void psensor_list_update_measures(struct psensor **sensors)
 
 #ifdef HAVE_ATASMART
        if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART))
-               hdd_psensor_list_update(sensors);
+               atasmart_psensor_list_update(sensors);
 #endif
 }