[GNUnet-SVN] r9435 - in gnunet/src: include util

[gnunet]

Author: durner
Date: 2009-11-09 11:45:18 -0700 (Mon, 09 Nov 2009)
New Revision: 9435

Modified:
   gnunet/src/include/gnunet_container_lib.h
   gnunet/src/util/common_allocation.c
   gnunet/src/util/container_slist.c
   gnunet/src/util/network.c
   gnunet/src/util/test_container_slist.c
Log:
fix leak, improve API

Modified: gnunet/src/include/gnunet_container_lib.h
===================================================================
--- gnunet/src/include/gnunet_container_lib.h   2009-11-09 17:56:54 UTC (rev 
9434)
+++ gnunet/src/include/gnunet_container_lib.h   2009-11-09 18:45:18 UTC (rev 
9435)
@@ -1010,6 +1010,13 @@
                            size_t *len);
 
 
+/**
+ * Release an iterator
+ * @param i iterator
+ */
+void GNUNET_CONTAINER_slist_iter_destroy (struct 
GNUNET_CONTAINER_SList_Iterator *i);
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif

Modified: gnunet/src/util/common_allocation.c
===================================================================
--- gnunet/src/util/common_allocation.c 2009-11-09 17:56:54 UTC (rev 9434)
+++ gnunet/src/util/common_allocation.c 2009-11-09 18:45:18 UTC (rev 9435)
@@ -31,7 +31,7 @@
 #define INT_MAX 0x7FFFFFFF
 #endif
 
-#ifdef MINGW
+#if 0
   #define W32_MEM_LIMIT 200000000
 #endif
 

Modified: gnunet/src/util/container_slist.c
===================================================================
--- gnunet/src/util/container_slist.c   2009-11-09 17:56:54 UTC (rev 9434)
+++ gnunet/src/util/container_slist.c   2009-11-09 18:45:18 UTC (rev 9435)
@@ -332,4 +332,13 @@
   return i->elem->elem;
 }
 
+/**
+ * Release an iterator
+ * @param i iterator
+ */
+void GNUNET_CONTAINER_slist_iter_destroy (struct 
GNUNET_CONTAINER_SList_Iterator *i)
+{
+  GNUNET_free (i);
+}
+
 /* end of container_slist.c */

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2009-11-09 17:56:54 UTC (rev 9434)
+++ gnunet/src/util/network.c   2009-11-09 18:45:18 UTC (rev 9435)
@@ -666,6 +666,7 @@
                                   GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                   handle, len);
     }
+  GNUNET_CONTAINER_slist_iter_destroy (iter);
 #endif /*  */
 }
 
@@ -954,6 +955,7 @@
                   on_next = GNUNET_YES;
                 }
             }
+           GNUNET_CONTAINER_slist_iter_destroy (i);
         }
 
       /* Poll for faulty pipes */
@@ -982,6 +984,7 @@
               else
                 on_next = GNUNET_NO;
             }
+          GNUNET_CONTAINER_slist_iter_destroy (i);
         }
 
       /* FIXME */

Modified: gnunet/src/util/test_container_slist.c
===================================================================
--- gnunet/src/util/test_container_slist.c      2009-11-09 17:56:54 UTC (rev 
9434)
+++ gnunet/src/util/test_container_slist.c      2009-11-09 18:45:18 UTC (rev 
9435)
@@ -68,7 +68,7 @@
                                      
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                      &j, sizeof (j));
     }
-  GNUNET_free (it);
+  GNUNET_CONTAINER_slist_iter_destroy (it);
   CHECK (GNUNET_CONTAINER_slist_count (l) == 200);
   i = 198;
   CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)));
@@ -93,7 +93,7 @@
 
       GNUNET_CONTAINER_slist_erase (it);
     }
-  GNUNET_free (it);
+  GNUNET_CONTAINER_slist_iter_destroy (it);
   CHECK (GNUNET_CONTAINER_slist_count (l) == 100);
   i = 99;
   CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO);