-DOC first pass through UTIL container library

8 files changed, 0 insertions, 702 deletions

diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 9f6c3c0cc..4bfb82d14 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -467,17 +467,6 @@ testBitCallback (void *cls,
 
 /* *********************** INTERFACE **************** */
 
-/**
- * Load a bloom-filter from a file.
- *
- * @param filename the name of the file (or the prefix)
- * @param size the size of the bloom-filter (number of
- *        bytes of storage space to use); will be rounded up
- *        to next power of 2
- * @param k the number of GNUNET_CRYPTO_hash-functions to apply per
- *        element (number of bits set per element in the set)
- * @return the bloomfilter
- */
 struct GNUNET_CONTAINER_BloomFilter *
 GNUNET_CONTAINER_bloomfilter_load (const char *filename,
                                    size_t size,
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 35d7cd4ab..24f753adb 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -129,12 +129,6 @@ check (const struct GNUNET_CONTAINER_HeapNode *node)
 #endif
 
 
-/**
- * Create a new heap.
- *
- * @param order how should the heap be sorted?
- * @return handle to the heap
- */
 struct GNUNET_CONTAINER_Heap *
 GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order)
 {
@@ -146,12 +140,6 @@ GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order)
 }
 
 
-/**
- * Destroys the heap.  Only call on a heap that
- * is already empty.
- *
- * @param heap heap to destroy
- */
 void
 GNUNET_CONTAINER_heap_destroy (struct GNUNET_CONTAINER_Heap *heap)
 {
@@ -160,12 +148,6 @@ GNUNET_CONTAINER_heap_destroy (struct GNUNET_CONTAINER_Heap *heap)
 }
 
 
-/**
- * Get element stored at the root of @a heap.
- *
- * @param heap  Heap to inspect.
- * @return Element at the root, or NULL if heap is empty.
- */
 void *
 GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap)
 {
@@ -199,12 +181,6 @@ GNUNET_CONTAINER_heap_peek2 (const struct GNUNET_CONTAINER_Heap *heap,
 }
 
 
-/**
- * Get the current size of the heap
- *
- * @param heap the heap to get the size of
- * @return number of elements stored
- */
 unsigned int
 GNUNET_CONTAINER_heap_get_size (const struct GNUNET_CONTAINER_Heap *heap)
 {
@@ -212,12 +188,6 @@ GNUNET_CONTAINER_heap_get_size (const struct GNUNET_CONTAINER_Heap *heap)
 }
 
 
-/**
- * Get the current cost of the node
- *
- * @param node the node to get the cost of
- * @return cost of the node
- */
 GNUNET_CONTAINER_HeapCostType
 GNUNET_CONTAINER_heap_node_get_cost (const struct GNUNET_CONTAINER_HeapNode
                                      *node)
@@ -252,13 +222,6 @@ node_iterator (const struct GNUNET_CONTAINER_Heap *heap,
 }
 
 
-/**
- * Iterate over all entries in the heap.
- *
- * @param heap the heap
- * @param iterator function to call on each entry
- * @param iterator_cls closure for iterator
- */
 void
 GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
                                GNUNET_CONTAINER_HeapIterator iterator,
@@ -268,17 +231,6 @@ GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
 }
 
 
-/**
- * Perform a random walk of the tree.  The walk is biased
- * towards elements closer to the root of the tree (since
- * each walk starts at the root and ends at a random leaf).
- * The heap internally tracks the current position of the
- * walk.
- *
- * @param heap heap to walk
- * @return data stored at the next random node in the walk;
- *         NULL if the tree is empty.
- */
 void *
 GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap *heap)
 {
@@ -360,14 +312,6 @@ insert_node (struct GNUNET_CONTAINER_Heap *heap,
 }
 
 
-/**
- * Inserts a new element into the heap.
- *
- * @param heap heap to modify
- * @param element element to insert
- * @param cost cost for the element
- * @return node for the new element
- */
 struct GNUNET_CONTAINER_HeapNode *
 GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap, void *element,
                               GNUNET_CONTAINER_HeapCostType cost)
@@ -536,12 +480,6 @@ GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_HeapNode *node)
 }
 
 
-/**
- * Updates the cost of any node in the tree
- *
- * @param node node for which the cost is to be changed
- * @param new_cost new cost for the node
- */
 void
 GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_HeapNode *node,
                                    GNUNET_CONTAINER_HeapCostType new_cost)
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index 2c477db40..52882c5f3 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -241,11 +241,6 @@ invalidate_sbuf (struct GNUNET_CONTAINER_MetaData *md)
 }
 
 
-/**
- * Free meta data.
- *
- * @param md what to free
- */
 void
 GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md)
 {
@@ -263,11 +258,6 @@ GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md)
 }
 
 
-/**
- * Remove all items in the container.
- *
- * @param md metadata to manipulate
- */
 void
 GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md)
 {
@@ -285,16 +275,6 @@ GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md)
 }
 
 
-/**
- * Test if two MDs are equal.  We consider them equal if
- * the meta types, formats and content match (we do not
- * include the mime types and plugins names in this
- * consideration).
- *
- * @param md1 first value to check
- * @param md2 other value to check
- * @return #GNUNET_YES if they are equal
- */
 int
 GNUNET_CONTAINER_meta_data_test_equal (const struct GNUNET_CONTAINER_MetaData
                                        *md1,
@@ -451,13 +431,6 @@ merge_helper (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
 }
 
 
-/**
- * Extend metadata.  Merges the meta data from the second argument
- * into the first, discarding duplicate key-value pairs.
- *
- * @param md metadata to extend
- * @param in metadata to merge
- */
 void
 GNUNET_CONTAINER_meta_data_merge (struct GNUNET_CONTAINER_MetaData *md,
                                   const struct GNUNET_CONTAINER_MetaData *in)
@@ -466,16 +439,6 @@ GNUNET_CONTAINER_meta_data_merge (struct GNUNET_CONTAINER_MetaData *md,
 }
 
 
-/**
- * Remove an item.
- *
- * @param md metadata to manipulate
- * @param type type of the item to remove
- * @param data specific value to remove, NULL to remove all
- *        entries of the given type
- * @param data_size number of bytes in @a data
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the item does not exist in md
- */
 int
 GNUNET_CONTAINER_meta_data_delete (struct GNUNET_CONTAINER_MetaData *md,
                                    enum EXTRACTOR_MetaType type,
@@ -503,12 +466,6 @@ GNUNET_CONTAINER_meta_data_delete (struct GNUNET_CONTAINER_MetaData *md,
 }
 
 
-/**
- * Add the current time as the publication date
- * to the meta-data.
- *
- * @param md metadata to modify
- */
 void
 GNUNET_CONTAINER_meta_data_add_publication_date (struct
                                                  GNUNET_CONTAINER_MetaData *md)
@@ -556,16 +513,6 @@ GNUNET_CONTAINER_meta_data_iterate (const struct GNUNET_CONTAINER_MetaData *md,
 }
 
 
-/**
- * Get the first MD entry of the given type.  Caller
- * is responsible for freeing the return value.
- * Also, only meta data items that are strings (0-terminated)
- * are returned by this function.
- *
- * @param md metadata to inspect
- * @param type type to look for
- * @return NULL if no entry was found
- */
 char *
 GNUNET_CONTAINER_meta_data_get_by_type (const struct
                                         GNUNET_CONTAINER_MetaData *md,
@@ -584,17 +531,6 @@ GNUNET_CONTAINER_meta_data_get_by_type (const struct
 }
 
 
-/**
- * Get the first matching MD entry of the given types. Caller is
- * responsible for freeing the return value.  Also, only meta data
- * items that are strings (0-terminated) are returned by this
- * function.
- *
- * @param md metadata to inspect
- * @param ... -1-terminated list of types
- * @return NULL if we do not have any such entry,
- *  otherwise client is responsible for freeing the value!
- */
 char *
 GNUNET_CONTAINER_meta_data_get_first_by_types (const struct
                                                GNUNET_CONTAINER_MetaData *md,
@@ -997,12 +933,6 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
 }
 
 
-/**
- * Get the size of the full meta-data in serialized form.
- *
- * @param md metadata to inspect
- * @return number of bytes needed for serialization, -1 on error
- */
 ssize_t
 GNUNET_CONTAINER_meta_data_get_serialized_size (const struct
                                                 GNUNET_CONTAINER_MetaData *md)
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index 08893d81f..8b1deac12 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -175,21 +175,6 @@ struct GNUNET_CONTAINER_MultiHashMapIterator
 };
 
 
-/**
- * Create a multi hash map.
- *
- * @param len initial size (map will grow as needed)
- * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default;
- *                         #GNUNET_YES means that on 'put', the 'key' does not have
- *                         to be copied as the destination of the pointer is
- *                         guaranteed to be life as long as the value is stored in
- *                         the hashmap.  This can significantly reduce memory
- *                         consumption, but of course is also a recipe for
- *                         heap corruption if the assumption is not true.  Only
- *                         use this if (1) memory use is important in this case and
- *                         (2) you have triple-checked that the invariant holds
- * @return NULL on error
- */
 struct GNUNET_CONTAINER_MultiHashMap *
 GNUNET_CONTAINER_multihashmap_create (unsigned int len, int do_not_copy_keys)
 {
@@ -225,12 +210,6 @@ GNUNET_CONTAINER_multihashmap_create (unsigned int len, int do_not_copy_keys)
 }
 
 
-/**
- * Destroy a hash map.  Will not free any values stored in the hash
- * map!
- *
- * @param map the map
- */
 void
 GNUNET_CONTAINER_multihashmap_destroy (
   struct GNUNET_CONTAINER_MultiHashMap *map)
@@ -289,12 +268,6 @@ idx_of (const struct GNUNET_CONTAINER_MultiHashMap *map,
 }
 
 
-/**
- * Get the number of key-value pairs in the map.
- *
- * @param map the map
- * @return the number of key value pairs
- */
 unsigned int
 GNUNET_CONTAINER_multihashmap_size (
   const struct GNUNET_CONTAINER_MultiHashMap *map)
@@ -303,16 +276,6 @@ GNUNET_CONTAINER_multihashmap_size (
 }
 
 
-/**
- * Given a key find a value in the map matching the key.
- *
- * @param map the map
- * @param key what to look for
- * @return NULL if no value was found; note that
- *   this is indistinguishable from values that just
- *   happen to be NULL; use "contains" to test for
- *   key-value pairs with value NULL
- */
 void *
 GNUNET_CONTAINER_multihashmap_get (
   const struct GNUNET_CONTAINER_MultiHashMap *map,
@@ -341,15 +304,6 @@ GNUNET_CONTAINER_multihashmap_get (
 }
 
 
-/**
- * Iterate over all entries in the map.
- *
- * @param map the map
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multihashmap_iterate (
   struct GNUNET_CONTAINER_MultiHashMap *map,
@@ -447,17 +401,6 @@ update_next_cache_sme (struct GNUNET_CONTAINER_MultiHashMap *map,
 }
 
 
-/**
- * Remove the given key-value pair from the map.  Note that if the
- * key-value pair is in the map multiple times, only one of the pairs
- * will be removed.
- *
- * @param map the map
- * @param key key of the key-value pair
- * @param value value of the key-value pair
- * @return #GNUNET_YES on success, #GNUNET_NO if the key-value pair
- *  is not in the map
- */
 int
 GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map,
                                       const struct GNUNET_HashCode *key,
@@ -516,14 +459,6 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map,
 }
 
 
-/**
- * Remove all entries for the given key from the map.
- * Note that the values would not be "freed".
- *
- * @param map the map
- * @param key identifies values to be removed
- * @return number of values removed
- */
 int
 GNUNET_CONTAINER_multihashmap_remove_all (
   struct GNUNET_CONTAINER_MultiHashMap *map,
@@ -642,15 +577,6 @@ GNUNET_CONTAINER_multihashmap_clear (struct GNUNET_CONTAINER_MultiHashMap *map)
 }
 
 
-/**
- * Check if the map contains any value under the given
- * key (including values that are NULL).
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multihashmap_contains (
   const struct GNUNET_CONTAINER_MultiHashMap *map,
@@ -679,16 +605,6 @@ GNUNET_CONTAINER_multihashmap_contains (
 }
 
 
-/**
- * Check if the map contains the given value under the given
- * key.
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @param value value to test for
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multihashmap_contains_value (
   const struct GNUNET_CONTAINER_MultiHashMap *map,
@@ -860,16 +776,6 @@ GNUNET_CONTAINER_multihashmap_put (struct GNUNET_CONTAINER_MultiHashMap *map,
 }
 
 
-/**
- * Iterate over all entries in the map that match a particular key.
- *
- * @param map the map
- * @param key key that the entries must correspond to
- * @param it function to call on each entry
- * @param it_cls extra argument to it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multihashmap_get_multiple (
   struct GNUNET_CONTAINER_MultiHashMap *map,
@@ -997,18 +903,6 @@ GNUNET_CONTAINER_multihashmap_get_random (
 }
 
 
-/**
- * Create an iterator for a multihashmap.
- * The iterator can be used to retrieve all the elements in the multihashmap
- * one by one, without having to handle all elements at once (in contrast to
- * GNUNET_CONTAINER_multihashmap_iterate()).  Note that the iterator can not be
- * used anymore if elements have been removed from 'map' after the creation of
- * the iterator, or 'map' has been destroyed.  Adding elements to 'map' may
- * result in skipped or repeated elements.
- *
- * @param map the map to create an iterator for
- * @return an iterator over the given multihashmap 'map'
- */
 struct GNUNET_CONTAINER_MultiHashMapIterator *
 GNUNET_CONTAINER_multihashmap_iterator_create (
   const struct GNUNET_CONTAINER_MultiHashMap *map)
@@ -1023,20 +917,6 @@ GNUNET_CONTAINER_multihashmap_iterator_create (
 }
 
 
-/**
- * Retrieve the next element from the hash map at the iterator's position.
- * If there are no elements left, GNUNET_NO is returned, and 'key' and 'value'
- * are not modified.
- * This operation is only allowed if no elements have been removed from the
- * multihashmap since the creation of 'iter', and the map has not been destroyed.
- * Adding elements may result in repeating or skipping elements.
- *
- * @param iter the iterator to get the next element from
- * @param key pointer to store the key in, can be NULL
- * @param value pointer to store the value in, can be NULL
- * @return #GNUNET_YES we returned an element,
- *         #GNUNET_NO if we are out of elements
- */
 int
 GNUNET_CONTAINER_multihashmap_iterator_next (
   struct GNUNET_CONTAINER_MultiHashMapIterator *iter,
@@ -1082,11 +962,6 @@ GNUNET_CONTAINER_multihashmap_iterator_next (
 }
 
 
-/**
- * Destroy a multihashmap iterator.
- *
- * @param iter the iterator to destroy
- */
 void
 GNUNET_CONTAINER_multihashmap_iterator_destroy (
   struct GNUNET_CONTAINER_MultiHashMapIterator *iter)
diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c
index f349a5f80..ccedd1bbb 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -195,12 +195,6 @@ idx_of (const struct GNUNET_CONTAINER_MultiHashMap32 *m, const uint32_t key)
 }
 
 
-/**
- * Get the number of key-value pairs in the map.
- *
- * @param map the map
- * @return the number of key value pairs
- */
 unsigned int
 GNUNET_CONTAINER_multihashmap32_size (
   const struct GNUNET_CONTAINER_MultiHashMap32 *map)
@@ -209,16 +203,6 @@ GNUNET_CONTAINER_multihashmap32_size (
 }
 
 
-/**
- * Given a key find a value in the map matching the key.
- *
- * @param map the map
- * @param key what to look for
- * @return NULL if no value was found; note that
- *   this is indistinguishable from values that just
- *   happen to be NULL; use "contains" to test for
- *   key-value pairs with value NULL
- */
 void *
 GNUNET_CONTAINER_multihashmap32_get (
   const struct GNUNET_CONTAINER_MultiHashMap32 *map,
@@ -237,15 +221,6 @@ GNUNET_CONTAINER_multihashmap32_get (
 }
 
 
-/**
- * Iterate over all entries in the map.
- *
- * @param map the map
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multihashmap32_iterate (
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
@@ -300,17 +275,6 @@ update_next_cache (struct GNUNET_CONTAINER_MultiHashMap32 *map,
 }
 
 
-/**
- * Remove the given key-value pair from the map.  Note that if the
- * key-value pair is in the map multiple times, only one of the pairs
- * will be removed.
- *
- * @param map the map
- * @param key key of the key-value pair
- * @param value value of the key-value pair
- * @return #GNUNET_YES on success, #GNUNET_NO if the key-value pair
- *  is not in the map
- */
 int
 GNUNET_CONTAINER_multihashmap32_remove (
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
@@ -346,14 +310,6 @@ GNUNET_CONTAINER_multihashmap32_remove (
 }
 
 
-/**
- * Remove all entries for the given key from the map.
- * Note that the values would not be "freed".
- *
- * @param map the map
- * @param key identifies values to be removed
- * @return number of values removed
- */
 int
 GNUNET_CONTAINER_multihashmap32_remove_all (
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
@@ -397,15 +353,6 @@ GNUNET_CONTAINER_multihashmap32_remove_all (
 }
 
 
-/**
- * Check if the map contains any value under the given
- * key (including values that are NULL).
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multihashmap32_contains (
   const struct GNUNET_CONTAINER_MultiHashMap32 *map,
@@ -424,16 +371,6 @@ GNUNET_CONTAINER_multihashmap32_contains (
 }
 
 
-/**
- * Check if the map contains the given value under the given
- * key.
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @param value value to test for
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multihashmap32_contains_value (
   const struct GNUNET_CONTAINER_MultiHashMap32 *map,
@@ -549,16 +486,6 @@ GNUNET_CONTAINER_multihashmap32_put (
 }
 
 
-/**
- * Iterate over all entries in the map that match a particular key.
- *
- * @param map the map
- * @param key key that the entries must correspond to
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multihashmap32_get_multiple (
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c
index fa4d2210b..976f172e1 100644
--- a/src/util/container_multipeermap.c
+++ b/src/util/container_multipeermap.c
@@ -174,21 +174,6 @@ struct GNUNET_CONTAINER_MultiPeerMapIterator
 };
 
 
-/**
- * Create a multi hash map.
- *
- * @param len initial size (map will grow as needed)
- * @param do_not_copy_keys GNUNET_NO is always safe and should be used by default;
- *                         GNUNET_YES means that on 'put', the 'key' does not have
- *                         to be copied as the destination of the pointer is
- *                         guaranteed to be life as long as the value is stored in
- *                         the hashmap.  This can significantly reduce memory
- *                         consumption, but of course is also a recipe for
- *                         heap corruption if the assumption is not true.  Only
- *                         use this if (1) memory use is important in this case and
- *                         (2) you have triple-checked that the invariant holds
- * @return NULL on error
- */
 struct GNUNET_CONTAINER_MultiPeerMap *
 GNUNET_CONTAINER_multipeermap_create (unsigned int len,
                                       int do_not_copy_keys)
@@ -209,12 +194,6 @@ GNUNET_CONTAINER_multipeermap_create (unsigned int len,
 }
 
 
-/**
- * Destroy a hash map.  Will not free any values
- * stored in the hash map!
- *
- * @param map the map
- */
 void
 GNUNET_CONTAINER_multipeermap_destroy (
   struct GNUNET_CONTAINER_MultiPeerMap *map)
@@ -276,12 +255,6 @@ idx_of (const struct GNUNET_CONTAINER_MultiPeerMap *map,
 }
 
 
-/**
- * Get the number of key-value pairs in the map.
- *
- * @param map the map
- * @return the number of key value pairs
- */
 unsigned int
 GNUNET_CONTAINER_multipeermap_size (
   const struct GNUNET_CONTAINER_MultiPeerMap *map)
@@ -290,16 +263,6 @@ GNUNET_CONTAINER_multipeermap_size (
 }
 
 
-/**
- * Given a key find a value in the map matching the key.
- *
- * @param map the map
- * @param key what to look for
- * @return NULL if no value was found; note that
- *   this is indistinguishable from values that just
- *   happen to be NULL; use "contains" to test for
- *   key-value pairs with value NULL
- */
 void *
 GNUNET_CONTAINER_multipeermap_get (
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
@@ -324,15 +287,6 @@ GNUNET_CONTAINER_multipeermap_get (
 }
 
 
-/**
- * Iterate over all entries in the map.
- *
- * @param map the map
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multipeermap_iterate (
   struct GNUNET_CONTAINER_MultiPeerMap *map,
@@ -430,17 +384,6 @@ update_next_cache_sme (struct GNUNET_CONTAINER_MultiPeerMap *map,
 }
 
 
-/**
- * Remove the given key-value pair from the map.  Note that if the
- * key-value pair is in the map multiple times, only one of the pairs
- * will be removed.
- *
- * @param map the map
- * @param key key of the key-value pair
- * @param value value of the key-value pair
- * @return #GNUNET_YES on success, #GNUNET_NO if the key-value pair
- *  is not in the map
- */
 int
 GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map,
                                       const struct GNUNET_PeerIdentity *key,
@@ -496,14 +439,6 @@ GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map,
 }
 
 
-/**
- * Remove all entries for the given key from the map.
- * Note that the values would not be "freed".
- *
- * @param map the map
- * @param key identifies values to be removed
- * @return number of values removed
- */
 int
 GNUNET_CONTAINER_multipeermap_remove_all (
   struct GNUNET_CONTAINER_MultiPeerMap *map,
@@ -584,15 +519,6 @@ GNUNET_CONTAINER_multipeermap_remove_all (
 }
 
 
-/**
- * Check if the map contains any value under the given
- * key (including values that are NULL).
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multipeermap_contains (
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
@@ -617,16 +543,6 @@ GNUNET_CONTAINER_multipeermap_contains (
 }
 
 
-/**
- * Check if the map contains the given value under the given
- * key.
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @param value value to test for
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multipeermap_contains_value (
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
@@ -711,18 +627,6 @@ grow (struct GNUNET_CONTAINER_MultiPeerMap *map)
 }
 
 
-/**
- * Store a key-value pair in the map.
- *
- * @param map the map
- * @param key key to use
- * @param value value to use
- * @param opt options for put
- * @return #GNUNET_OK on success,
- *         #GNUNET_NO if a value was replaced (with REPLACE)
- *         #GNUNET_SYSERR if #GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY was the option and the
- *                       value already exists
- */
 int
 GNUNET_CONTAINER_multipeermap_put (struct GNUNET_CONTAINER_MultiPeerMap *map,
                                    const struct GNUNET_PeerIdentity *key,
@@ -794,16 +698,6 @@ GNUNET_CONTAINER_multipeermap_put (struct GNUNET_CONTAINER_MultiPeerMap *map,
 }
 
 
-/**
- * Iterate over all entries in the map that match a particular key.
- *
- * @param map the map
- * @param key key that the entries must correspond to
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multipeermap_get_multiple (
   struct GNUNET_CONTAINER_MultiPeerMap *map,
@@ -930,18 +824,6 @@ GNUNET_CONTAINER_multipeermap_get_random (
 }
 
 
-/**
- * Create an iterator for a multipeermap.
- * The iterator can be used to retrieve all the elements in the multipeermap
- * one by one, without having to handle all elements at once (in contrast to
- * #GNUNET_CONTAINER_multipeermap_iterate).  Note that the iterator can not be
- * used anymore if elements have been removed from 'map' after the creation of
- * the iterator, or 'map' has been destroyed.  Adding elements to 'map' may
- * result in skipped or repeated elements.
- *
- * @param map the map to create an iterator for
- * @return an iterator over the given multipeermap 'map'
- */
 struct GNUNET_CONTAINER_MultiPeerMapIterator *
 GNUNET_CONTAINER_multipeermap_iterator_create (
   const struct GNUNET_CONTAINER_MultiPeerMap *map)
@@ -956,20 +838,6 @@ GNUNET_CONTAINER_multipeermap_iterator_create (
 }
 
 
-/**
- * Retrieve the next element from the hash map at the iterator's position.
- * If there are no elements left, GNUNET_NO is returned, and 'key' and 'value'
- * are not modified.
- * This operation is only allowed if no elements have been removed from the
- * multipeermap since the creation of 'iter', and the map has not been destroyed.
- * Adding elements may result in repeating or skipping elements.
- *
- * @param iter the iterator to get the next element from
- * @param key pointer to store the key in, can be NULL
- * @param value pointer to store the value in, can be NULL
- * @return #GNUNET_YES we returned an element,
- *         #GNUNET_NO if we are out of elements
- */
 int
 GNUNET_CONTAINER_multipeermap_iterator_next (
   struct GNUNET_CONTAINER_MultiPeerMapIterator *iter,
@@ -1015,11 +883,6 @@ GNUNET_CONTAINER_multipeermap_iterator_next (
 }
 
 
-/**
- * Destroy a multipeermap iterator.
- *
- * @param iter the iterator to destroy
- */
 void
 GNUNET_CONTAINER_multipeermap_iterator_destroy (
   struct GNUNET_CONTAINER_MultiPeerMapIterator *iter)
diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c
index 77e5ca139..a02d55770 100644
--- a/src/util/container_multishortmap.c
+++ b/src/util/container_multishortmap.c
@@ -209,12 +209,6 @@ GNUNET_CONTAINER_multishortmap_create (unsigned int len, int do_not_copy_keys)
 }
 
 
-/**
- * Destroy a hash map.  Will not free any values
- * stored in the hash map!
- *
- * @param map the map
- */
 void
 GNUNET_CONTAINER_multishortmap_destroy (
   struct GNUNET_CONTAINER_MultiShortmap *map)
@@ -276,12 +270,6 @@ idx_of (const struct GNUNET_CONTAINER_MultiShortmap *map,
 }
 
 
-/**
- * Get the number of key-value pairs in the map.
- *
- * @param map the map
- * @return the number of key value pairs
- */
 unsigned int
 GNUNET_CONTAINER_multishortmap_size (
   const struct GNUNET_CONTAINER_MultiShortmap *map)
@@ -290,16 +278,6 @@ GNUNET_CONTAINER_multishortmap_size (
 }
 
 
-/**
- * Given a key find a value in the map matching the key.
- *
- * @param map the map
- * @param key what to look for
- * @return NULL if no value was found; note that
- *   this is indistinguishable from values that just
- *   happen to be NULL; use "contains" to test for
- *   key-value pairs with value NULL
- */
 void *
 GNUNET_CONTAINER_multishortmap_get (
   const struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -324,15 +302,6 @@ GNUNET_CONTAINER_multishortmap_get (
 }
 
 
-/**
- * Iterate over all entries in the map.
- *
- * @param map the map
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multishortmap_iterate (
   struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -427,17 +396,6 @@ update_next_cache_sme (struct GNUNET_CONTAINER_MultiShortmap *map,
 }
 
 
-/**
- * Remove the given key-value pair from the map.  Note that if the
- * key-value pair is in the map multiple times, only one of the pairs
- * will be removed.
- *
- * @param map the map
- * @param key key of the key-value pair
- * @param value value of the key-value pair
- * @return #GNUNET_YES on success, #GNUNET_NO if the key-value pair
- *  is not in the map
- */
 int
 GNUNET_CONTAINER_multishortmap_remove (
   struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -494,14 +452,6 @@ GNUNET_CONTAINER_multishortmap_remove (
 }
 
 
-/**
- * Remove all entries for the given key from the map.
- * Note that the values would not be "freed".
- *
- * @param map the map
- * @param key identifies values to be removed
- * @return number of values removed
- */
 int
 GNUNET_CONTAINER_multishortmap_remove_all (
   struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -582,15 +532,6 @@ GNUNET_CONTAINER_multishortmap_remove_all (
 }
 
 
-/**
- * Check if the map contains any value under the given
- * key (including values that are NULL).
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multishortmap_contains (
   const struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -615,16 +556,6 @@ GNUNET_CONTAINER_multishortmap_contains (
 }
 
 
-/**
- * Check if the map contains the given value under the given
- * key.
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @param value value to test for
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multishortmap_contains_value (
   const struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -708,18 +639,6 @@ grow (struct GNUNET_CONTAINER_MultiShortmap *map)
 }
 
 
-/**
- * Store a key-value pair in the map.
- *
- * @param map the map
- * @param key key to use
- * @param value value to use
- * @param opt options for put
- * @return #GNUNET_OK on success,
- *         #GNUNET_NO if a value was replaced (with REPLACE)
- *         #GNUNET_SYSERR if #GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY was the option and the
- *                       value already exists
- */
 int
 GNUNET_CONTAINER_multishortmap_put (
   struct GNUNET_CONTAINER_MultiShortmap *map,
@@ -914,18 +833,6 @@ GNUNET_CONTAINER_multishortmap_get_random (
 }
 
 
-/**
- * Create an iterator for a multishortmap.
- * The iterator can be used to retrieve all the elements in the multishortmap
- * one by one, without having to handle all elements at once (in contrast to
- * #GNUNET_CONTAINER_multishortmap_iterate).  Note that the iterator can not be
- * used anymore if elements have been removed from 'map' after the creation of
- * the iterator, or 'map' has been destroyed.  Adding elements to 'map' may
- * result in skipped or repeated elements.
- *
- * @param map the map to create an iterator for
- * @return an iterator over the given multishortmap 'map'
- */
 struct GNUNET_CONTAINER_MultiShortmapIterator *
 GNUNET_CONTAINER_multishortmap_iterator_create (
   const struct GNUNET_CONTAINER_MultiShortmap *map)
@@ -940,20 +847,6 @@ GNUNET_CONTAINER_multishortmap_iterator_create (
 }
 
 
-/**
- * Retrieve the next element from the hash map at the iterator's position.
- * If there are no elements left, GNUNET_NO is returned, and 'key' and 'value'
- * are not modified.
- * This operation is only allowed if no elements have been removed from the
- * multishortmap since the creation of 'iter', and the map has not been destroyed.
- * Adding elements may result in repeating or skipping elements.
- *
- * @param iter the iterator to get the next element from
- * @param key pointer to store the key in, can be NULL
- * @param value pointer to store the value in, can be NULL
- * @return #GNUNET_YES we returned an element,
- *         #GNUNET_NO if we are out of elements
- */
 int
 GNUNET_CONTAINER_multishortmap_iterator_next (
   struct GNUNET_CONTAINER_MultiShortmapIterator *iter,
@@ -999,11 +892,6 @@ GNUNET_CONTAINER_multishortmap_iterator_next (
 }
 
 
-/**
- * Destroy a multishortmap iterator.
- *
- * @param iter the iterator to destroy
- */
 void
 GNUNET_CONTAINER_multishortmap_iterator_destroy (
   struct GNUNET_CONTAINER_MultiShortmapIterator *iter)
diff --git a/src/util/container_multiuuidmap.c b/src/util/container_multiuuidmap.c
index f2ed304b3..fbc4c8c39 100644
--- a/src/util/container_multiuuidmap.c
+++ b/src/util/container_multiuuidmap.c
@@ -209,12 +209,6 @@ GNUNET_CONTAINER_multiuuidmap_create (unsigned int len, int do_not_copy_keys)
 }
 
 
-/**
- * Destroy a hash map.  Will not free any values
- * stored in the hash map!
- *
- * @param map the map
- */
 void
 GNUNET_CONTAINER_multiuuidmap_destroy (
   struct GNUNET_CONTAINER_MultiUuidmap *map)
@@ -276,12 +270,6 @@ idx_of (const struct GNUNET_CONTAINER_MultiUuidmap *map,
 }
 
 
-/**
- * Get the number of key-value pairs in the map.
- *
- * @param map the map
- * @return the number of key value pairs
- */
 unsigned int
 GNUNET_CONTAINER_multiuuidmap_size (
   const struct GNUNET_CONTAINER_MultiUuidmap *map)
@@ -290,16 +278,6 @@ GNUNET_CONTAINER_multiuuidmap_size (
 }
 
 
-/**
- * Given a key find a value in the map matching the key.
- *
- * @param map the map
- * @param key what to look for
- * @return NULL if no value was found; note that
- *   this is indistinguishable from values that just
- *   happen to be NULL; use "contains" to test for
- *   key-value pairs with value NULL
- */
 void *
 GNUNET_CONTAINER_multiuuidmap_get (
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
@@ -324,15 +302,6 @@ GNUNET_CONTAINER_multiuuidmap_get (
 }
 
 
-/**
- * Iterate over all entries in the map.
- *
- * @param map the map
- * @param it function to call on each entry
- * @param it_cls extra argument to @a it
- * @return the number of key value pairs processed,
- *         #GNUNET_SYSERR if it aborted iteration
- */
 int
 GNUNET_CONTAINER_multiuuidmap_iterate (
   struct GNUNET_CONTAINER_MultiUuidmap *map,
@@ -427,17 +396,6 @@ update_next_cache_sme (struct GNUNET_CONTAINER_MultiUuidmap *map,
 }
 
 
-/**
- * Remove the given key-value pair from the map.  Note that if the
- * key-value pair is in the map multiple times, only one of the pairs
- * will be removed.
- *
- * @param map the map
- * @param key key of the key-value pair
- * @param value value of the key-value pair
- * @return #GNUNET_YES on success, #GNUNET_NO if the key-value pair
- *  is not in the map
- */
 int
 GNUNET_CONTAINER_multiuuidmap_remove (struct GNUNET_CONTAINER_MultiUuidmap *map,
                                       const struct GNUNET_Uuid *key,
@@ -493,14 +451,6 @@ GNUNET_CONTAINER_multiuuidmap_remove (struct GNUNET_CONTAINER_MultiUuidmap *map,
 }
 
 
-/**
- * Remove all entries for the given key from the map.
- * Note that the values would not be "freed".
- *
- * @param map the map
- * @param key identifies values to be removed
- * @return number of values removed
- */
 int
 GNUNET_CONTAINER_multiuuidmap_remove_all (
   struct GNUNET_CONTAINER_MultiUuidmap *map,
@@ -581,15 +531,6 @@ GNUNET_CONTAINER_multiuuidmap_remove_all (
 }
 
 
-/**
- * Check if the map contains any value under the given
- * key (including values that are NULL).
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multiuuidmap_contains (
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
@@ -614,16 +555,6 @@ GNUNET_CONTAINER_multiuuidmap_contains (
 }
 
 
-/**
- * Check if the map contains the given value under the given
- * key.
- *
- * @param map the map
- * @param key the key to test if a value exists for it
- * @param value value to test for
- * @return #GNUNET_YES if such a value exists,
- *         #GNUNET_NO if not
- */
 int
 GNUNET_CONTAINER_multiuuidmap_contains_value (
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
@@ -707,18 +638,6 @@ grow (struct GNUNET_CONTAINER_MultiUuidmap *map)
 }
 
 
-/**
- * Store a key-value pair in the map.
- *
- * @param map the map
- * @param key key to use
- * @param value value to use
- * @param opt options for put
- * @return #GNUNET_OK on success,
- *         #GNUNET_NO if a value was replaced (with REPLACE)
- *         #GNUNET_SYSERR if #GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY was the option and the
- *                       value already exists
- */
 int
 GNUNET_CONTAINER_multiuuidmap_put (struct GNUNET_CONTAINER_MultiUuidmap *map,
                                    const struct GNUNET_Uuid *key,
@@ -912,18 +831,6 @@ GNUNET_CONTAINER_multiuuidmap_get_random (
 }
 
 
-/**
- * Create an iterator for a multiuuidmap.
- * The iterator can be used to retrieve all the elements in the multiuuidmap
- * one by one, without having to handle all elements at once (in contrast to
- * #GNUNET_CONTAINER_multiuuidmap_iterate).  Note that the iterator can not be
- * used anymore if elements have been removed from 'map' after the creation of
- * the iterator, or 'map' has been destroyed.  Adding elements to 'map' may
- * result in skipped or repeated elements.
- *
- * @param map the map to create an iterator for
- * @return an iterator over the given multiuuidmap 'map'
- */
 struct GNUNET_CONTAINER_MultiUuidmapIterator *
 GNUNET_CONTAINER_multiuuidmap_iterator_create (
   const struct GNUNET_CONTAINER_MultiUuidmap *map)
@@ -938,20 +845,6 @@ GNUNET_CONTAINER_multiuuidmap_iterator_create (
 }
 
 
-/**
- * Retrieve the next element from the hash map at the iterator's position.
- * If there are no elements left, GNUNET_NO is returned, and 'key' and 'value'
- * are not modified.
- * This operation is only allowed if no elements have been removed from the
- * multiuuidmap since the creation of 'iter', and the map has not been destroyed.
- * Adding elements may result in repeating or skipping elements.
- *
- * @param iter the iterator to get the next element from
- * @param key pointer to store the key in, can be NULL
- * @param value pointer to store the value in, can be NULL
- * @return #GNUNET_YES we returned an element,
- *         #GNUNET_NO if we are out of elements
- */
 int
 GNUNET_CONTAINER_multiuuidmap_iterator_next (
   struct GNUNET_CONTAINER_MultiUuidmapIterator *iter,
@@ -997,11 +890,6 @@ GNUNET_CONTAINER_multiuuidmap_iterator_next (
 }
 
 
-/**
- * Destroy a multiuuidmap iterator.
- *
- * @param iter the iterator to destroy
- */
 void
 GNUNET_CONTAINER_multiuuidmap_iterator_destroy (
   struct GNUNET_CONTAINER_MultiUuidmapIterator *iter)