X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhdd_atasmart.c;h=0fd7d5d7f4e1f12bcad8f073ae88a33cac13280d;hb=7a7b46f5b74ea2bfbbcf7da5951b24efaed4b21f;hp=051e09c4e26b7edefd4dafcb0bb8db8f9b17f360;hpb=31b996e36947d05b76a36f63ed7c20374187b574;p=psensor.git diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c index 051e09c..0fd7d5d 100644 --- 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;