X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=statuses%2Fcpuusage.c;h=355f6bbc96a160617ad04d62f4765d333f161fa1;hb=2ddbfa53a31360e50565345a1ac08c0799c8243e;hp=dd9f1c516eb3e86ef67d4c51821cccb2d3b5defb;hpb=9102c7c65421f2ef3e415c7e76a741657e34663b;p=sysstatus.git

diff --git a/statuses/cpuusage.c b/statuses/cpuusage.c
index dd9f1c5..355f6bb 100644
--- a/statuses/cpuusage.c
+++ b/statuses/cpuusage.c
@@ -6,13 +6,13 @@
 #include "../config.h"
 
 #ifndef NUM_CPUS
-	#define NUM_CPUS 1
+  #define NUM_CPUS 1
 #endif
 #ifndef CPU_HISTORY_SIZE
-	#define CPU_HISTORY_SIZE 1
+  #define CPU_HISTORY_SIZE 1
 #endif
 #if CPU_HISTORY_SIZE < 1
-	#define CPU_HISTORY_SIZE 1
+  #define CPU_HISTORY_SIZE 1
 #endif
 
 
@@ -22,64 +22,69 @@ float cpu_history[CPU_HISTORY_SIZE]; // don't care about init values
 
 void status_cpuusage()
 {
-	double loadavg[3] = { -13.37, -13.37, -13.37 } ;
+  double loadavg[3] = { -13.37, -13.37, -13.37 } ;
 
-	char *stline = NULL;
-	size_t stlen;
-	FILE *stfile;
+  char *stline = NULL;
+  size_t stlen;
+  FILE *stfile;
 
-	unsigned long cpu_user;
-	unsigned long cpu_nice;
-	unsigned long cpu_sys;
-	unsigned long cpu_used;
-	unsigned long cpu_idle;
-	unsigned long cpu_total;
-	int i;
+  unsigned long cpu_user;
+  unsigned long cpu_nice;
+  unsigned long cpu_sys;
+  unsigned long cpu_used;
+  unsigned long cpu_idle;
+  unsigned long cpu_total;
+  int i;
 
 
-	fputs("^fg(yellow)", stdout);	// Error signaling color
+  // Error signaling color
+  fputs("^fg(yellow)", stdout);
 
-	stfile = fopen("/proc/stat", "r");
-	if (stfile != NULL)
-	{
-		for(i = CPU_HISTORY_SIZE - 1; i > 0; i--)
-			cpu_history[i] = cpu_history[i - 1];
+  stfile = fopen("/proc/stat", "r");
+  if (stfile != NULL) {
+    for(i = CPU_HISTORY_SIZE - 1; i > 0; i--) {
+      cpu_history[i] = cpu_history[i - 1];
+    }
 
-		stlen = getline(&stline, &stlen, stfile);
-		fclose(stfile);
+    stlen = getline(&stline, &stlen, stfile);
+    fclose(stfile);
 
-		if ( 4 == sscanf(stline, "%*s %ld %ld %ld %ld", &cpu_user, &cpu_nice, &cpu_sys, &cpu_idle) )
-		{
-			cpu_used = cpu_user + cpu_nice + cpu_sys;
-			cpu_total = cpu_used + cpu_idle;
+    if ( 4 == sscanf(stline, "%*s %ld %ld %ld %ld",
+                    &cpu_user, &cpu_nice, &cpu_sys, &cpu_idle) ) {
+      cpu_used = cpu_user + cpu_nice + cpu_sys;
+      cpu_total = cpu_used + cpu_idle;
 
-			// Now do the percentage
-			cpu_history[0] = (float)(cpu_used - last_cpu_used) /
-						(float)(cpu_total - last_cpu_total);
+      // Now do the percentage
+      cpu_history[0] = (float)(cpu_used - last_cpu_used) /
+                        (float)(cpu_total - last_cpu_total);
 
-			last_cpu_used = cpu_used;
-			last_cpu_total = cpu_total;
+      last_cpu_used = cpu_used;
+      last_cpu_total = cpu_total;
 
 
-			if (cpu_history[0] < 0.4)
-				fputs("^fg(#0077FF)", stdout);	// CPU idling OK
-			else
-				fputs("^fg(#FF00FF)", stdout);	// CPU busy
+      if (cpu_history[0] < 0.4) {
+        // CPU idling OK
+        fputs("^fg(#0077FF)", stdout);
+      } else {
+        // CPU busy
+        fputs("^fg(#FF00FF)", stdout);
+      }
 
-			//printf(" CPU: %.0f%% ", cpu_history[0] * 100);
-		}
+      //printf(" CPU: %.0f%% ", cpu_history[0] * 100);
+    }
 
-		free(stline);
-	}
+    free(stline);
+  }
 
 
-	if (getloadavg(loadavg, 3) > 0)
-		printf(" %s%.0f,%.0f,%.0f,%.0f ",
-			cpu_history[0] < 0.1000 ? " " : "",
-			cpu_history[0] * 100,
-			loadavg[0] * (100 / 1),
-			loadavg[1] * (100 / 1),	// (100 / NUM_CPUS)
-			loadavg[2] * (100 / 1));
+  if (getloadavg(loadavg, 3) > 0) {
+    printf(" %s%.0f,%.0f,%.0f,%.0f ",
+            cpu_history[0] < 0.1000 ? " " : "",
+            cpu_history[0] * 100,
+            loadavg[0] * (100 / 1),
+            loadavg[1] * (100 / 1),  // (100 / NUM_CPUS)
+            loadavg[2] * (100 / 1));
+  }
 
-	//fputs(" CPU usage ", stdout);
+  //fputs(" CPU usage ", stdout);
 }