1 files changed, 39 insertions, 35 deletions

diff --git a/src/util/container_slist.c b/src/util/container_slist.c
index 1dd0344e4..144d352ce 100644
--- a/src/util/container_slist.c
+++ b/src/util/container_slist.c
@@ -27,6 +27,8 @@
 #include "platform.h"
 #include "gnunet_container_lib.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
 /**
  * Element in our linked list.
  */
@@ -108,21 +110,21 @@ struct GNUNET_CONTAINER_SList_Iterator
  */
 static struct GNUNET_CONTAINER_SList_Elem *
 create_elem (enum GNUNET_CONTAINER_SListDisposition disp, const void *buf,
-             size_t len)
+             size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
   if (disp == GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT)
-  {
-    e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem) + len);
-    memcpy (&e[1], buf, len);
-    e->elem = (void *) &e[1];
-  }
+    {
+      e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem) + len);
+      memcpy (&e[1], buf, len);
+      e->elem = (void *) &e[1];
+    }
   else
-  {
-    e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem));
-    e->elem = (void *) buf;
-  }
+    {
+      e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem));
+      e->elem = (void *) buf;
+    }
   e->disp = disp;
   e->len = len;
   return e;
@@ -138,8 +140,8 @@ create_elem (enum GNUNET_CONTAINER_SListDisposition disp, const void *buf,
  */
 void
 GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l,
-                            enum GNUNET_CONTAINER_SListDisposition disp,
-                            const void *buf, size_t len)
+                            enum GNUNET_CONTAINER_SListDisposition disp,
+                            const void *buf, size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
@@ -160,8 +162,8 @@ GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l,
  */
 void
 GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l,
-                                enum GNUNET_CONTAINER_SListDisposition disp,
-                                const void *buf, size_t len)
+                                enum GNUNET_CONTAINER_SListDisposition disp,
+                                const void *buf, size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
@@ -182,7 +184,7 @@ GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l,
  */
 void
 GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst,
-                               struct GNUNET_CONTAINER_SList *src)
+                               struct GNUNET_CONTAINER_SList *src)
 {
   struct GNUNET_CONTAINER_SList_Iterator *i;
 
@@ -190,14 +192,15 @@ GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst,
        GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
        GNUNET_CONTAINER_slist_next (i))
 
-  {
-    GNUNET_CONTAINER_slist_add (dst,
-                                (i->elem->disp ==
-                                 GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC) ?
-                                GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC :
-                                GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
-                                i->elem->elem, i->elem->len);
-  }
+    {
+      GNUNET_CONTAINER_slist_add (dst,
+                                  (i->elem->disp ==
+                                   GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC)
+                                  ? GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC
+                                  :
+                                  GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+                                  i->elem->elem, i->elem->len);
+    }
   GNUNET_CONTAINER_slist_iter_destroy (i);
 }
 
@@ -254,13 +257,13 @@ GNUNET_CONTAINER_slist_clear (struct GNUNET_CONTAINER_SList *l)
 
   e = l->head;
   while (e != NULL)
-  {
-    n = e->next;
-    if (e->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC)
-      GNUNET_free (e->elem);
-    GNUNET_free (e);
-    e = n;
-  }
+    {
+      n = e->next;
+      if (e->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC)
+        GNUNET_free (e->elem);
+      GNUNET_free (e);
+      e = n;
+    }
   l->head = NULL;
   l->tail = NULL;
   l->length = 0;
@@ -276,7 +279,7 @@ GNUNET_CONTAINER_slist_clear (struct GNUNET_CONTAINER_SList *l)
  */
 int
 GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l,
-                                 const void *buf, size_t len)
+                                 const void *buf, size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
@@ -333,8 +336,8 @@ GNUNET_CONTAINER_slist_erase (struct GNUNET_CONTAINER_SList_Iterator *i)
  */
 void
 GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator *before,
-                               enum GNUNET_CONTAINER_SListDisposition disp,
-                               const void *buf, size_t len)
+                               enum GNUNET_CONTAINER_SListDisposition disp,
+                               const void *buf, size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
@@ -387,7 +390,7 @@ GNUNET_CONTAINER_slist_end (struct GNUNET_CONTAINER_SList_Iterator *i)
  */
 void *
 GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i,
-                            size_t * len)
+                            size_t * len)
 {
   if (len)
     *len = i->elem->len;
@@ -399,7 +402,8 @@ GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i,
  * @param i iterator
  */
 void
-GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator *i)
+GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator
+                                     *i)
 {
   GNUNET_free (i);
 }