From b30a380c5d45f3b5987d336e3df3226baedfa46b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 19 Sep 2014 09:14:26 +0200
Subject: [PATCH] normalize code

---
 src/lib/amd.c | 15 +++------------
 src/lib/amd.h | 12 +-----------
 src/main.c    |  2 +-
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/lib/amd.c b/src/lib/amd.c
index 9d0f51f..59a1822 100644
--- a/src/lib/amd.c
+++ b/src/lib/amd.c
@@ -280,28 +280,19 @@ void amd_psensor_list_update(struct psensor **sensors)
 }
 
 /* Entry point for AMD sensors */
-struct psensor * *
-amd_psensor_list_add(struct psensor **sensors, int values_len)
+void amd_psensor_list_append(struct psensor ***sensors, int values_len)
 {
 	int i, j, n;
-	struct psensor **tmp, **ss, *s;
+	struct psensor *s;
 
 	n = init();
 
-	ss = sensors;
 	for (i = 0; i < n; i++)
 		/* Each GPU Adapter has 3 sensors: temp, fan speed and usage */
 		for (j = 0; j < 3; j++) {
 			s = create_sensor(i, j, values_len);
-			tmp = psensor_list_add(ss, s);
-
-			if (ss != tmp)
-				free(ss);
-
-			ss = tmp;
+			psensor_list_append(sensors, s);
 		}
-
-	return ss;
 }
 
 void amd_cleanup()
diff --git a/src/lib/amd.h b/src/lib/amd.h
index acb234d..d7dde40 100644
--- a/src/lib/amd.h
+++ b/src/lib/amd.h
@@ -22,19 +22,9 @@
 
 #include "psensor.h"
 
-/*
-  Updates temperatures of AMD sensors.
-*/
 void amd_psensor_list_update(struct psensor **sensors);
 
-/*
-  Adds AMD sensors to a given list of sensors.
-
-  Returns the new allocated list of sensors if sensors have been added
-  otherwise returns 'sensors'. The list is 'NULL' terminated.
- */
-struct psensor **amd_psensor_list_add(struct psensor **sensors,
-					 int values_max_length);
+void amd_psensor_list_append(struct psensor ***sensors, int values_max_length);
 
 void amd_cleanup();
 
diff --git a/src/main.c b/src/main.c
index 22072f6..ba3eafb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -472,7 +472,7 @@ static struct psensor **create_sensors_list(const char *url,
 #endif
 #ifdef HAVE_LIBATIADL
 		if (config_is_atiadlsdk_enabled())
-			sensors = amd_psensor_list_add(sensors, 600);
+			amd_psensor_list_append(&sensors, 600);
 #endif
 #ifdef HAVE_GTOP
 		if (config_is_gtop2_enabled())
-- 
2.7.4