[GNUnet-SVN] r28541 - gnunet/src/util

[gnunet]

Author: dold
Date: 2013-08-12 17:16:15 +0200 (Mon, 12 Aug 2013)
New Revision: 28541

Modified:
   gnunet/src/util/container_multihashmap.c
   gnunet/src/util/test_container_multihashmap.c
Log:
- test memory leak


Modified: gnunet/src/util/container_multihashmap.c
===================================================================
--- gnunet/src/util/container_multihashmap.c    2013-08-12 15:07:01 UTC (rev 
28540)
+++ gnunet/src/util/container_multihashmap.c    2013-08-12 15:16:15 UTC (rev 
28541)
@@ -840,7 +840,7 @@
 GNUNET_CONTAINER_multihashmap_iterator_next (struct 
GNUNET_CONTAINER_MultiHashMapIterator *iter,
                                              struct GNUNET_HashCode *key, 
const void **value)
 {
-  /* make sure nobody modified the map */
+  /* make sure the map has not been modified */
   GNUNET_assert (iter->modification_counter == 
iter->map->modification_counter);
 
   /* look for the next entry, skipping empty buckets */
@@ -883,7 +883,7 @@
  * @param iter the iterator to destroy
  */
 void
-GNUNET_CONTAINER_multihashmap_enumerator_destroy (struct 
GNUNET_CONTAINER_MultiHashMapIterator *iter)
+GNUNET_CONTAINER_multihashmap_iterator_destroy (struct 
GNUNET_CONTAINER_MultiHashMapIterator *iter)
 {
   GNUNET_free (iter);
 }

Modified: gnunet/src/util/test_container_multihashmap.c
===================================================================
--- gnunet/src/util/test_container_multihashmap.c       2013-08-12 15:07:01 UTC 
(rev 28540)
+++ gnunet/src/util/test_container_multihashmap.c       2013-08-12 15:16:15 UTC 
(rev 28541)
@@ -87,6 +87,7 @@
   CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, 
&key_ret, (const void **)&ret));
   CHECK (0 == memcmp (&key_ret, &k1, sizeof (key_ret)));
   CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, 
NULL));
+  GNUNET_free (iter);
 
   CHECK (2 == GNUNET_CONTAINER_multihashmap_remove_all (m, &k1));
   for (j = 0; j < 1024; j++)
@@ -97,6 +98,7 @@
   for (j = 0; j < GNUNET_CONTAINER_multihashmap_size (m); j++)
     CHECK (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, 
NULL, NULL));
   CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, 
NULL));
+  GNUNET_free (iter);
 
   GNUNET_CONTAINER_multihashmap_destroy (m);
   return 0;