Merge pull request #850 from sgraham/ocd

whitespace/comment/wrap fixes, no intended functionality change

1 files changed, 19 insertions, 16 deletions

diff --git a/src/util.cc b/src/util.cc
index 7717ef4..746d7ed 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -510,33 +510,34 @@ static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks)
   static uint64_t previous_idle_ticks = 0;
   static uint64_t previous_total_ticks = 0;
   static double previous_load = -0.0;
-  
+
   uint64_t idle_ticks_since_last_time = idle_ticks - previous_idle_ticks;
   uint64_t total_ticks_since_last_time = total_ticks - previous_total_ticks;
-  
+
   bool first_call = (previous_total_ticks == 0);
   bool ticks_not_updated_since_last_call = (total_ticks_since_last_time == 0);
-  
+
   double load;
   if (first_call || ticks_not_updated_since_last_call) {
     load = previous_load;
   } else {
-    //calculate load
-    double idle_to_total_ratio = ((double)idle_ticks_since_last_time) / total_ticks_since_last_time;
+    // Calculate load.
+    double idle_to_total_ratio =
+        ((double)idle_ticks_since_last_time) / total_ticks_since_last_time;
     double load_since_last_call = 1.0 - idle_to_total_ratio;
-    
-    //filter/smooth result when possible
+
+    // Filter/smooth result when possible.
     if(previous_load > 0) {
       load = 0.9 * previous_load + 0.1 * load_since_last_call;
     } else {
       load = load_since_last_call;
     }
   }
-  
+
   previous_load = load;
   previous_total_ticks = total_ticks;
   previous_idle_ticks = idle_ticks;
-  
+
   return load;
 }
 
@@ -549,22 +550,24 @@ static uint64_t FileTimeToTickCount(const FILETIME & ft)
 
 double GetLoadAverage() {
   FILETIME idle_time, kernel_time, user_time;
-  BOOL get_system_time_succeeded = GetSystemTimes(&idle_time, &kernel_time, &user_time);
-  
+  BOOL get_system_time_succeeded =
+      GetSystemTimes(&idle_time, &kernel_time, &user_time);
+
   double posix_compatible_load;
   if (get_system_time_succeeded) {
     uint64_t idle_ticks = FileTimeToTickCount(idle_time);
-    
-    //kernel_time from GetSystemTimes already includes idle_time
-    uint64_t total_ticks = FileTimeToTickCount(kernel_time) + FileTimeToTickCount(user_time);
-    
+
+    // kernel_time from GetSystemTimes already includes idle_time.
+    uint64_t total_ticks =
+        FileTimeToTickCount(kernel_time) + FileTimeToTickCount(user_time);
+
     double processor_load = CalculateProcessorLoad(idle_ticks, total_ticks);
     posix_compatible_load = processor_load * GetProcessorCount();
 
   } else {
     posix_compatible_load = -0.0;
   }
-  
+
   return posix_compatible_load;
 }
 #else