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

[gnunet]

Author: grothoff
Date: 2010-02-22 09:53:48 +0100 (Mon, 22 Feb 2010)
New Revision: 10390

Modified:
   gnunet/src/util/container_multihashmap.c
Log:
allow remove of current entry

Modified: gnunet/src/util/container_multihashmap.c
===================================================================
--- gnunet/src/util/container_multihashmap.c    2010-02-22 08:37:53 UTC (rev 
10389)
+++ gnunet/src/util/container_multihashmap.c    2010-02-22 08:53:48 UTC (rev 
10390)
@@ -192,17 +192,18 @@
   int count;
   unsigned int i;
   struct MapEntry *e;
+  struct MapEntry *n;
 
   count = 0;
   for (i = 0; i < map->map_length; i++)
     {
-      e = map->map[i];
-      while (e != NULL)
+      n = map->map[i];
+      while (NULL != (e = n))
         {
+         n = e->next;
           if ((NULL != it) && (GNUNET_OK != it (it_cls, &e->key, e->value)))
             return GNUNET_SYSERR;
           count++;
-          e = e->next;
         }
     }
   return count;