cleanup

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

diff --git a/src/lib/cpu.c b/src/lib/cpu.c
index 462a2fc..df6b963 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,
@@ -88,16 +88,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++;
        }
 }