Reformat code base with clang-format-4.0.

* To make reformatting reproducible `make reformat` was used.

Signed-off-by: Victor Toni <[email protected]>

Author: ViToni

src/callout.c

@@ -32,19 +32,18 @@
 **
 */
 
-
 #include "igmpproxy.h"
 
 /* the code below implements a callout queue */
-static int id = 0;
-static struct timeOutQueue  *queue = 0; /* pointer to the beginning of timeout queue */
+static int                  id    = 0;
+static struct timeOutQueue *queue = 0; /* pointer to the beginning of timeout queue */
 
 struct timeOutQueue {
-    struct timeOutQueue    *next;   // Next event in queue
-    int                     id;
-    timer_f                 func;   // function to call
-    void                    *data;  // Data for function
-    int                     time;   // Time offset for next event
+    struct timeOutQueue *next; // Next event in queue
+    int                  id;
+    timer_f              func; // function to call
+    void *               data; // Data for function
+    int                  time; // Time offset for next event
 };
 
 // Method for dumping the Queue to the log.
@@ -53,44 +52,47 @@ static void debugQueue(void);
 /**
 *   Initializes the callout queue
 */
-void callout_init(void) {
+void callout_init(void)
+{
     queue = NULL;
 }
 
 /**
 *   Clears all scheduled timeouts...
 */
-void free_all_callouts(void) {
+void free_all_callouts(void)
+{
     struct timeOutQueue *p;
 
     while (queue) {
-        p = queue;
+        p     = queue;
         queue = queue->next;
         free(p);
     }
 }
 
-
 /**
  * elapsed_time seconds have passed; perform all the events that should
  * happen.
  */
-void age_callout_queue(int elapsed_time) {
+void age_callout_queue(int elapsed_time)
+{
     struct timeOutQueue *ptr;
     struct timeOutQueue *_queue = NULL;
-    struct timeOutQueue *last = NULL;
-    int i = 0;
+    struct timeOutQueue *last   = NULL;
+    int                  i      = 0;
 
     for (ptr = queue; ptr; ptr = ptr->next) {
         if (ptr->time > elapsed_time) {
             ptr->time -= elapsed_time;
             break;
-        } else {
+        }
+        else {
             elapsed_time -= ptr->time;
             if (_queue == NULL)
                 _queue = ptr;
-            last = ptr;
-         }
+            last       = ptr;
+        }
     }
 
     queue = ptr;
@@ -103,7 +105,7 @@ void age_callout_queue(int elapsed_time) {
         _queue = _queue->next;
         my_log(LOG_DEBUG, 0, "About to call timeout %d (#%d)", ptr->id, i);
         if (ptr->func)
-             ptr->func(ptr->data);
+            ptr->func(ptr->data);
         free(ptr);
     }
 }
@@ -112,11 +114,11 @@ void age_callout_queue(int elapsed_time) {
  * Return in how many seconds age_callout_queue() would like to be called.
  * Return -1 if there are no events pending.
  */
-int timer_nextTimer(void) {
+int timer_nextTimer(void)
+{
     if (queue) {
         if (queue->time < 0) {
-            my_log(LOG_WARNING, 0, "timer_nextTimer top of queue says %d", 
-                queue->time);
+            my_log(LOG_WARNING, 0, "timer_nextTimer top of queue says %d", queue->time);
             return 0;
         }
         return queue->time;
@@ -130,12 +132,13 @@ int timer_nextTimer(void) {
  *  @param action - The function to call on timeout.
  *  @param data - Pointer to the function data to supply...
  */
-int timer_setTimer(int delay, timer_f action, void *data) {
-    struct timeOutQueue  *ptr, *node, *prev;
-    int i = 0;
+int timer_setTimer(int delay, timer_f action, void *data)
+{
+    struct timeOutQueue *ptr, *node, *prev;
+    int                  i = 0;
 
     /* create a node */
-    node = (struct timeOutQueue *)malloc(sizeof(struct timeOutQueue));
+    node = (struct timeOutQueue *) malloc(sizeof(struct timeOutQueue));
     if (node == 0) {
         my_log(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n");
         return -1;
@@ -167,23 +170,22 @@ int timer_setTimer(int delay, timer_f action, void *data) {
                     prev->next = node;
                 }
                 ptr->time -= node->time;
-                my_log(LOG_DEBUG, 0,
-                    "Created timeout %d (#%d) - delay %d secs",
-                    node->id, i, node->time);
+                my_log(LOG_DEBUG, 0, "Created timeout %d (#%d) - delay %d secs", node->id, i, node->time);
                 debugQueue();
                 return node->id;
-            } else {
+            }
+            else {
                 // Continur to check nodes.
-                delay -= ptr->time; node->time = delay;
-                prev = ptr;
-                ptr = ptr->next;
+                delay -= ptr->time;
+                node->time = delay;
+                prev       = ptr;
+                ptr        = ptr->next;
             }
             i++;
         }
         prev->next = node;
     }
-    my_log(LOG_DEBUG, 0, "Created timeout %d (#%d) - delay %d secs",
-            node->id, i, node->time);
+    my_log(LOG_DEBUG, 0, "Created timeout %d (#%d) - delay %d secs", node->id, i, node->time);
     debugQueue();
 
     return node->id;
@@ -192,9 +194,10 @@ int timer_setTimer(int delay, timer_f action, void *data) {
 /**
 *   returns the time until the timer is scheduled
 */
-int timer_leftTimer(int timer_id) {
+int timer_leftTimer(int timer_id)
+{
     struct timeOutQueue *ptr;
-    int left = 0;
+    int                  left = 0;
 
     if (!timer_id)
         return -1;
@@ -211,9 +214,10 @@ int timer_leftTimer(int timer_id) {
 /**
 *   clears the associated timer.  Returns 1 if succeeded.
 */
-int timer_clearTimer(int  timer_id) {
-    struct timeOutQueue  *ptr, *prev;
-    int i = 0;
+int timer_clearTimer(int timer_id)
+{
+    struct timeOutQueue *ptr, *prev;
+    int                  i = 0;
 
     if (!timer_id)
         return 0;
@@ -248,7 +252,7 @@ int timer_clearTimer(int  timer_id) {
             return 1;
         }
         prev = ptr;
-        ptr = ptr->next;
+        ptr  = ptr->next;
         i++;
     }
     // If we get here, the timer was not deleted.
@@ -260,8 +264,9 @@ int timer_clearTimer(int  timer_id) {
 /**
  * debugging utility
  */
-static void debugQueue(void) {
-    struct timeOutQueue  *ptr;
+static void debugQueue(void)
+{
+    struct timeOutQueue *ptr;
 
     for (ptr = queue; ptr; ptr = ptr->next) {
         my_log(LOG_DEBUG, 0, "(Id:%d, Time:%d) ", ptr->id, ptr->time);