fix timer comments/indentation

Author: GIC-de

code/common/src/timer.c

@@ -176,7 +176,7 @@ timer_enqueue_bucket(timer_root_s *root, timer_s *timer, time_t sec, long nsec)
         timer_bucket->sec, timer_bucket->nsec/1000);
 #endif
 
- INSERT:
+INSERT:
     timer->timer_bucket = timer_bucket;
     CIRCLEQ_INSERT_TAIL(&timer_bucket->timer_qhead, timer, timer_qnode);
     timer_bucket->timers++;
@@ -196,9 +196,7 @@ timer_dequeue_bucket(timer_s *timer)
     timer_bucket->timers--;
     timer->timer_bucket = NULL;
 
-    /*
-     * Defer deleting empty buckets to timer_process_changes().
-     */
+    /* Defer deleting empty buckets to timer_process_changes(). */
 }
 
 static void
@@ -350,9 +348,7 @@ timer_process_changes(timer_root_s *root)
     struct timespec now;
     clock_gettime(CLOCK_MONOTONIC, &now);
 
-    /*
-     * First work the chnaged timer list.
-     */
+    /* First process the changed timers list. */
     while(!CIRCLEQ_EMPTY(&root->timer_change_qhead)) {
         timer = CIRCLEQ_FIRST(&root->timer_change_qhead);
         timer_bucket = timer->timer_bucket;
@@ -380,25 +376,20 @@ timer_process_changes(timer_root_s *root)
         }
     }
 
-    /*
-     * Some buckets may be empty by now.
-     * Trash them here where it is safe.
-     */
+    /* Some buckets may be empty by now.
+     * Trash them here where it is safe. */
     CIRCLEQ_FOREACH_SAFE(timer_bucket, &root->timer_bucket_qhead,
-			 timer_bucket_qnode, timer_bucket_next) {
-
-	/* If the bucket is empty, remove it. */
-	if(!timer_bucket->timers) {
-	    CIRCLEQ_REMOVE(&root->timer_bucket_qhead, timer_bucket, timer_bucket_qnode);
-
+			             timer_bucket_qnode, timer_bucket_next) {
+        /* If the bucket is empty, remove it. */
+        if(!timer_bucket->timers) {
+            CIRCLEQ_REMOVE(&root->timer_bucket_qhead, timer_bucket, timer_bucket_qnode);
 #ifdef BNGBLASTER_TIMER_LOGGING
-	    LOG(TIMER_DETAIL, "  Delete timer bucket %lu.%06lus\n",
-		timer_bucket->sec, timer_bucket->nsec/1000);
+            LOG(TIMER_DETAIL, "  Delete timer bucket %lu.%06lus\n",
+                timer_bucket->sec, timer_bucket->nsec/1000);
 #endif
-
-	    free(timer_bucket);
-	    root->buckets--;
-	}
+            free(timer_bucket);
+            root->buckets--;
+        }
     }
 }
 

code/common/src/timer.h

@@ -16,11 +16,11 @@
 #define SEC     1000000000UL    /* 1 billion nanoseconds == 1 second */
 
 #ifndef CIRCLEQ_FOREACH_SAFE
-#define CIRCLEQ_FOREACH_SAFE(var, head, field, tvar)                      \
-    for ((var) = CIRCLEQ_FIRST((head));                                   \
-        (var) != (void *)(head) &&                                        \
-        ((tvar) = CIRCLEQ_NEXT((var), field), 1);                         \
-        (var) = (tvar))
+#define CIRCLEQ_FOREACH_SAFE(var, head, field, tvar) \
+    for ((var)   = CIRCLEQ_FIRST((head)); \
+         (var)  != (void *)(head) && \
+         ((tvar) = CIRCLEQ_NEXT((var), field), 1); \
+         (var)   = (tvar))
 #endif
 
 /*  Top level data structure for timers. */