From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 17 Sep 2014 20:01:34 +0000 (+0200)
Subject: code cleanup
X-Git-Tag: v1.1.2~70
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=dd51ec20a111ce967ec74d9d1fc805991dce3cba

code cleanup
---

diff --git a/src/lib/cpu.c b/src/lib/cpu.c
index 9f26db9..462a2fc 100644
--- a/src/lib/cpu.c
+++ b/src/lib/cpu.c
@@ -26,7 +26,6 @@
 
 #include "cpu.h"
 
-static glibtop_cpu *cpu;
 static float last_used;
 static float last_total;
 
@@ -62,24 +61,22 @@ cpu_psensor_list_add(struct psensor **sensors, int measures_len)
 
 static double get_usage()
 {
+	glibtop_cpu cpu;
 	unsigned long int used = 0;
 	unsigned long int dt;
 	double cpu_rate = UNKNOWN_DBL_VALUE;
 
-	if (!cpu)
-		cpu = malloc(sizeof(glibtop_cpu));
+	glibtop_get_cpu(&cpu);
 
-	glibtop_get_cpu(cpu);
+	used = cpu.user + cpu.nice + cpu.sys;
 
-	used = cpu->user + cpu->nice + cpu->sys;
-
-	dt = cpu->total - last_total;
+	dt = cpu.total - last_total;
 
 	if (dt)
 		cpu_rate = 100 * (used - last_used) / dt;
 
 	last_used = used;
-	last_total = cpu->total;
+	last_total = cpu.total;
 
 	return cpu_rate;
 }
@@ -104,9 +101,3 @@ void cpu_psensor_list_update(struct psensor **sensors)
 		ss++;
 	}
 }
-
-void cpu_cleanup()
-{
-	if (cpu)
-		free(cpu);
-}
diff --git a/src/lib/cpu.h b/src/lib/cpu.h
index a1d7125..81493e9 100644
--- a/src/lib/cpu.h
+++ b/src/lib/cpu.h
@@ -29,6 +29,4 @@ void cpu_psensor_list_update(struct psensor **);
 struct psensor **cpu_psensor_list_add(struct psensor **,
 				      int values_max_len);
 
-void cpu_cleanup();
-
 #endif
diff --git a/src/server/server.c b/src/server/server.c
index e0f69bb..8a6e578 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -458,7 +458,6 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_GTOP
 	sysinfo_cleanup();
-	cpu_cleanup();
 #endif
 
 	if (log_file != DEFAULT_LOG_FILE)