avoid useless assignment if not needed

[psensor.git] / src / lib / cpu.c

diff --git a/src/lib/cpu.c b/src/lib/cpu.c
index 462a2fc..9fb389b 100644 (file)
--- a/src/lib/cpu.c
+++ b/src/lib/cpu.c
@@ -38,7 +38,7 @@ struct psensor *create_cpu_usage_sensor(int measures_len)
 
        id = strdup("cpu usage");
        label = strdup("cpu usage");
-       type = SENSOR_TYPE_CPU_USAGE;
+       type = SENSOR_TYPE_GTOP | SENSOR_TYPE_CPU_USAGE;
 
        psensor = psensor_create(id,
                                 label,
@@ -62,9 +62,9 @@ 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 used;
        unsigned long int dt;
-       double cpu_rate = UNKNOWN_DBL_VALUE;
+       double cpu_rate;
 
        glibtop_get_cpu(&cpu);
 
@@ -74,6 +74,8 @@ static double get_usage()
 
        if (dt)
                cpu_rate = 100 * (used - last_used) / dt;
+       else
+               cpu_rate = UNKNOWN_DBL_VALUE;
 
        last_used = used;
        last_total = cpu.total;
@@ -88,16 +90,15 @@ void cpu_usage_sensor_update(struct psensor *s)
 
 void cpu_psensor_list_update(struct psensor **sensors)
 {
-       struct psensor **ss, *s;
+       struct psensor *s;
 
-       ss = sensors;
-       while (*ss) {
-               s = *ss;
+       while (*sensors) {
+               s = *sensors;
 
-               if (!(s->type & SENSOR_TYPE_REMOTE)
-                   && s->type == SENSOR_TYPE_CPU_USAGE)
+               if (s->type & SENSOR_TYPE_GTOP
+                   && s->type & SENSOR_TYPE_CPU_USAGE)
                        cpu_usage_sensor_update(s);
 
-               ss++;
+               sensors++;
        }
 }