From bd144cdfd8b753cdf25dceb84f286c4f0001b58b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 19 Sep 2014 11:33:00 +0200 Subject: [PATCH] normalize and cleanup --- src/lib/hdd.h | 4 +--- src/lib/hdd_hddtemp.c | 21 +++++---------------- src/lib/psensor.c | 12 +++--------- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/lib/hdd.h b/src/lib/hdd.h index f7cbeb6..8d4c316 100644 --- a/src/lib/hdd.h +++ b/src/lib/hdd.h @@ -27,9 +27,7 @@ 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, - int values_max_length); - +void hddtemp_psensor_list_append(struct psensor ***sensors, int values_length); void hddtemp_psensor_list_update(struct psensor **sensors); #endif diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c index 65964a1..1ce4884 100644 --- a/src/lib/hdd_hddtemp.c +++ b/src/lib/hdd_hddtemp.c @@ -174,33 +174,29 @@ static char *next_hdd_info(char *string, struct hdd_info *info) return c; } -struct psensor **hddtemp_psensor_list_add(struct psensor **sensors, - int values_max_length) +void +hddtemp_psensor_list_append(struct psensor ***sensors, int values_max_length) { char *hddtemp_output, *c; struct hdd_info info; - struct psensor **result; hddtemp_output = fetch(); if (!hddtemp_output) - return sensors; + return; if (hddtemp_output[0] != '|') { log_err(_("hddtemp: wrong string: %s."), hddtemp_output); free(hddtemp_output); - return sensors; + return; } c = hddtemp_output; - result = sensors; - while (c && (c = next_hdd_info(c, &info))) { struct psensor *sensor; - struct psensor **tmp_sensors; char *id; id = malloc(strlen(PROVIDER_NAME) + 1 + strlen(info.name) + 1); @@ -208,17 +204,10 @@ struct psensor **hddtemp_psensor_list_add(struct psensor **sensors, sensor = create_sensor(id, info.name, values_max_length); - tmp_sensors = psensor_list_add(result, sensor); - - if (result != sensors) - free(result); - - result = tmp_sensors; + psensor_list_append(sensors, sensor); } free(hddtemp_output); - - return result; } static void update(struct psensor **sensors, struct hdd_info *info) diff --git a/src/lib/psensor.c b/src/lib/psensor.c index f4b01b2..653b1b2 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -412,18 +412,12 @@ 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 = NULL; - if (!use_libatasmart) { - tmp_psensors = hddtemp_psensor_list_add(psensors, - values_max_length); - if (tmp_psensors != psensors) { - free(psensors); - psensors = tmp_psensors; - } - } + if (!use_libatasmart) + hddtemp_psensor_list_append(&psensors, values_max_length); + #ifdef HAVE_ATASMART else { atasmart_psensor_list_append(&psensors, -- 2.7.4