[GNUnet-SVN] r10245 - GNUnet/src/include

[gnunet]

Author: nevans
Date: 2010-02-07 16:00:34 +0100 (Sun, 07 Feb 2010)
New Revision: 10245

Modified:
   GNUnet/src/include/gnunet_util_containers.h
Log:
heap changes to fix strange dv iteration bug

Modified: GNUnet/src/include/gnunet_util_containers.h
===================================================================
--- GNUnet/src/include/gnunet_util_containers.h 2010-02-07 15:00:02 UTC (rev 
10244)
+++ GNUnet/src/include/gnunet_util_containers.h 2010-02-07 15:00:34 UTC (rev 
10245)
@@ -618,8 +618,9 @@
  * @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);
+struct GNUNET_CONTAINER_Heap *GNUNET_CONTAINER_heap_create (enum
+                                                            
GNUNET_CONTAINER_HeapOrder
+                                                            order);
 
 
 /**
@@ -637,8 +638,7 @@
  * @param heap heap to inspect
  * @return NULL if heap is empty
  */
-void *
-GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap);
+void *GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -662,9 +662,10 @@
  *         GNUNET_NO if not.
  */
 typedef int (*GNUNET_CONTAINER_HeapIterator) (void *cls,
-                                             struct GNUNET_CONTAINER_HeapNode 
*node,
-                                             void *element,
-                                              GNUNET_CONTAINER_HeapCostType 
cost);
+                                              struct GNUNET_CONTAINER_HeapNode
+                                              * node, void *element,
+                                              GNUNET_CONTAINER_HeapCostType
+                                              cost);
 
 
 /**
@@ -675,9 +676,9 @@
  * @param iterator_cls closure for iterator
  */
 void
-GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
-                              GNUNET_CONTAINER_HeapIterator iterator,
-                              void *iterator_cls);
+GNUNET_CONTAINER_heap_iterate (struct GNUNET_CONTAINER_Heap *heap,
+                               GNUNET_CONTAINER_HeapIterator iterator,
+                               void *iterator_cls);
 
 
 /**
@@ -691,8 +692,8 @@
  * @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);
+void *GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap
+                                           *heap);
 
 
 /**
@@ -703,10 +704,12 @@
  * @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);
+struct GNUNET_CONTAINER_HeapNode *GNUNET_CONTAINER_heap_insert (struct
+                                                                
GNUNET_CONTAINER_Heap
+                                                                *heap,
+                                                                void *element,
+                                                                
GNUNET_CONTAINER_HeapCostType
+                                                                cost);
 
 
 /**
@@ -715,8 +718,7 @@
  * @param heap heap to modify
  * @return element data stored at the root node
  */
-void *
-GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
+void *GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -726,9 +728,9 @@
  * @param node node to remove
  * @return element data stored at the node, NULL if heap is empty
  */
-void *
-GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap,
-                                  struct GNUNET_CONTAINER_HeapNode *node);
+void *GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap,
+                                         struct GNUNET_CONTAINER_HeapNode
+                                         *node);
 
 
 /**
@@ -740,8 +742,8 @@
  */
 void
 GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_Heap *heap,
-                                   struct GNUNET_CONTAINER_HeapNode *node, 
-                                  GNUNET_CONTAINER_HeapCostType new_cost);
+                                   struct GNUNET_CONTAINER_HeapNode *node,
+                                   GNUNET_CONTAINER_HeapCostType new_cost);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {