-try with finished

[oweals/gnunet.git] / src / util / container_slist.c

diff --git a/src/util/container_slist.c b/src/util/container_slist.c
index c06d70e91cecbc4c22cebf2d2e98c8d321d4fce6..7b85dc87760780239eeab9720e1e030f64cc97fb 100644 (file)
--- 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.
  */
@@ -55,7 +57,7 @@ struct GNUNET_CONTAINER_SList_Elem
 
 
 /**
- * Handle to a singly linked list  
+ * Handle to a singly linked list
  */
 struct GNUNET_CONTAINER_SList
 {
@@ -76,27 +78,6 @@ struct GNUNET_CONTAINER_SList
 };
 
 
-/**
- * Handle to a singly linked list iterator 
- */
-struct GNUNET_CONTAINER_SList_Iterator
-{
-  /**
-   * Linked list that we are iterating over.
-   */
-  struct GNUNET_CONTAINER_SList *list;
-
-  /**
-   * Last element accessed.
-   */
-  struct GNUNET_CONTAINER_SList_Elem *last;
-
-  /**
-   * Current list element.
-   */
-  struct GNUNET_CONTAINER_SList_Elem *elem;
-};
-
 
 /**
  * Create a new element that is to be inserted into the list
@@ -107,8 +88,8 @@ struct GNUNET_CONTAINER_SList_Iterator
  * @return a new element
  */
 static struct GNUNET_CONTAINER_SList_Elem *
-create_elem (enum GNUNET_CONTAINER_SListDisposition disp,
-             const void *buf, size_t len)
+create_elem (enum GNUNET_CONTAINER_SListDisposition disp, const void *buf,
+             size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
@@ -184,20 +165,21 @@ void
 GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst,
                                struct GNUNET_CONTAINER_SList *src)
 {
-  struct GNUNET_CONTAINER_SList_Iterator *i;
+  struct GNUNET_CONTAINER_SList_Iterator i;
 
-  for (i = GNUNET_CONTAINER_slist_begin (src); GNUNET_CONTAINER_slist_end (i) !=
-       GNUNET_YES; GNUNET_CONTAINER_slist_next (i))
+  for (i = GNUNET_CONTAINER_slist_begin (src);
+       GNUNET_CONTAINER_slist_end (&i) != GNUNET_YES;
+       GNUNET_CONTAINER_slist_next (&i))
 
   {
     GNUNET_CONTAINER_slist_add (dst,
-                                (i->elem->disp ==
+                                (i.elem->disp ==
                                  GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC) ?
                                 GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC :
                                 GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
-                                i->elem->elem, i->elem->len);
+                                i.elem->elem, i.elem->len);
   }
-  GNUNET_CONTAINER_slist_iter_destroy (i);
+  GNUNET_CONTAINER_slist_iter_destroy (&i);
 }
 
 
@@ -229,14 +211,14 @@ GNUNET_CONTAINER_slist_destroy (struct GNUNET_CONTAINER_SList *l)
  * @param l list
  * @return iterator pointing to the beginning
  */
-struct GNUNET_CONTAINER_SList_Iterator *
+struct GNUNET_CONTAINER_SList_Iterator
 GNUNET_CONTAINER_slist_begin (struct GNUNET_CONTAINER_SList *l)
 {
-  struct GNUNET_CONTAINER_SList_Iterator *ret;
+  struct GNUNET_CONTAINER_SList_Iterator ret;
 
-  ret = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Iterator));
-  ret->elem = l->head;
-  ret->list = l;
+  memset (&ret, 0, sizeof (ret));
+  ret.elem = l->head;
+  ret.list = l;
   return ret;
 }
 
@@ -400,7 +382,6 @@ GNUNET_CONTAINER_slist_get (const struct GNUNET_CONTAINER_SList_Iterator *i,
 void
 GNUNET_CONTAINER_slist_iter_destroy (struct GNUNET_CONTAINER_SList_Iterator *i)
 {
-  GNUNET_free (i);
 }
 
 /* end of container_slist.c */