1 files changed, 53 insertions, 32 deletions

diff --git a/include/list.h b/include/list.h
index 7184850f..6f84b12d 100644
--- a/include/list.h
+++ b/include/list.h
@@ -8,21 +8,23 @@
 #include "debug.h"
 #include "afl-prealloc.h"
 
-#define LIST_PREALLOC_SIZE (64)  /* How many elements to allocate before malloc is needed */
+#define LIST_PREALLOC_SIZE \
+  (64)             /* How many elements to allocate before malloc is needed */
 
 typedef struct list_element {
+
   PREALLOCABLE;
 
   struct list_element *prev;
   struct list_element *next;
-  void *data;
+  void *               data;
 
 } element_t;
 
 typedef struct list {
 
   element_t element_prealloc_buf[LIST_PREALLOC_SIZE];
-  u32 element_prealloc_count;
+  u32       element_prealloc_count;
 
 } list_t;
 
@@ -52,7 +54,8 @@ static void list_append(list_t *list, void *el) {
   }
 
   element_t *el_box = NULL;
-  PRE_ALLOC(el_box, list->element_prealloc_buf, LIST_PREALLOC_SIZE, list->element_prealloc_count);
+  PRE_ALLOC(el_box, list->element_prealloc_buf, LIST_PREALLOC_SIZE,
+            list->element_prealloc_count);
   if (!el_box) FATAL("failed to allocate list element");
   el_box->data = el;
   el_box->next = head;
@@ -62,59 +65,75 @@ static void list_append(list_t *list, void *el) {
 
 }
 
-/* Simple foreach. 
+/* Simple foreach.
    Pointer to the current element is in `el`,
    casted to (a pointer) of the given `type`.
    A return from this block will return from calling func.
 */
 
-#define LIST_FOREACH(list, type, block) do { \
-  list_t *li = (list);                       \
-  element_t *head = get_head((li));          \
-  element_t *el_box = (head)->next;          \
-  if (!el_box)                               \
-    FATAL("foreach over uninitialized list");\
-  while(el_box != head) {                    \
-    type *el = (type *)((el_box)->data);     \
-    /* get next so el_box can be unlinked */ \
-    element_t *next = el_box->next;          \
-    {block};                                 \
-    el_box = next;                           \
-  }                                          \
-} while(0);
+#define LIST_FOREACH(list, type, block)                    \
+  do {                                                     \
+                                                           \
+    list_t *   li = (list);                                \
+    element_t *head = get_head((li));                      \
+    element_t *el_box = (head)->next;                      \
+    if (!el_box) FATAL("foreach over uninitialized list"); \
+    while (el_box != head) {                               \
+                                                           \
+      type *el = (type *)((el_box)->data);                 \
+      /* get next so el_box can be unlinked */             \
+      element_t *next = el_box->next;                      \
+      {block};                                             \
+      el_box = next;                                       \
+                                                           \
+    }                                                      \
+                                                           \
+  } while (0);
 
 /* In foreach: remove the current el from the list */
 
-#define LIST_REMOVE_CURRENT_EL_IN_FOREACH() do { \
-    el_box->prev->next = next;                   \
-    el_box->next->prev = el_box->prev;           \
-    list_free_el(li, el_box);                    \
-} while(0);
+#define LIST_REMOVE_CURRENT_EL_IN_FOREACH() \
+  do {                                      \
+                                            \
+    el_box->prev->next = next;              \
+    el_box->next->prev = el_box->prev;      \
+    list_free_el(li, el_box);               \
+                                            \
+  } while (0);
 
 /* Same as foreach, but will clear list in the process */
 
-#define LIST_FOREACH_CLEAR(list, type, block) do { \
-  LIST_FOREACH((list), type, {                     \
-    {block};                                       \
-    LIST_REMOVE_CURRENT_EL_IN_FOREACH();           \
-  });                                              \
-} while(0);
+#define LIST_FOREACH_CLEAR(list, type, block) \
+  do {                                        \
+                                              \
+    LIST_FOREACH((list), type, {              \
+                                              \
+      {block};                                \
+      LIST_REMOVE_CURRENT_EL_IN_FOREACH();    \
+                                              \
+    });                                       \
+                                              \
+  } while (0);
 
 /* remove an item from the list */
 
 static void list_remove(list_t *list, void *remove_me) {
 
   LIST_FOREACH(list, void, {
+
     if (el == remove_me) {
+
       el_box->prev->next = el_box->next;
       el_box->next->prev = el_box->prev;
       el_box->data = NULL;
       list_free_el(list, el_box);
       return;
+
     }
+
   });
 
-  FATAL ("List item to be removed not in list");
+  FATAL("List item to be removed not in list");
 
 }
 
@@ -123,11 +142,13 @@ static void list_remove(list_t *list, void *remove_me) {
 static bool list_contains(list_t *list, void *contains_me) {
 
   LIST_FOREACH(list, void, {
+
     if (el == contains_me) return true;
+
   });
 
   return false;
 
 }
 
-#endif
\ No newline at end of file
+#endif