r2404 - in trunk/varnish-cache: include lib/libvarnish

[phk at projects.linpro.no]

Author: phk
Date: 2008-01-30 11:02:19 +0100 (Wed, 30 Jan 2008)
New Revision: 2404

Modified:
   trunk/varnish-cache/include/binary_heap.h
   trunk/varnish-cache/lib/libvarnish/binary_heap.c
Log:
Make sure we get the right assert() macro.

Constification.


Modified: trunk/varnish-cache/include/binary_heap.h
===================================================================
--- trunk/varnish-cache/include/binary_heap.h	2008-01-30 10:01:13 UTC (rev 2403)
+++ trunk/varnish-cache/include/binary_heap.h	2008-01-30 10:02:19 UTC (rev 2404)
@@ -69,7 +69,7 @@
 	 * The root item has 'idx' zero
 	 */
 
-void *binheap_root(struct binheap *);
+void *binheap_root(const struct binheap *);
 	/*
 	 * Return the root item
 	 */

Modified: trunk/varnish-cache/lib/libvarnish/binary_heap.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/binary_heap.c	2008-01-30 10:01:13 UTC (rev 2403)
+++ trunk/varnish-cache/lib/libvarnish/binary_heap.c	2008-01-30 10:02:19 UTC (rev 2404)
@@ -36,11 +36,11 @@
  * XXX: the array is not scaled back when items are deleted.
  */
 
-#include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include "binary_heap.h"
+#include "libvarnish.h"
 
 /* Private definitions -----------------------------------------------*/
 
@@ -66,7 +66,7 @@
 /* Implementation ----------------------------------------------------*/
 
 static void
-binheap_update(struct binheap *bh, unsigned u)
+binheap_update(const struct binheap *bh, unsigned u)
 {
 	assert(bh->magic == BINHEAP_MAGIC);
 	assert(u < bh->next);
@@ -97,7 +97,7 @@
 }
 
 static void
-binhead_swap(struct binheap *bh, unsigned u, unsigned v)
+binhead_swap(const struct binheap *bh, unsigned u, unsigned v)
 {
 	void *p;
 
@@ -112,7 +112,7 @@
 }
 
 static unsigned
-binheap_trickleup(struct binheap *bh, unsigned u)
+binheap_trickleup(const struct binheap *bh, unsigned u)
 {
 	unsigned v;
 
@@ -129,7 +129,7 @@
 }
 
 static void
-binheap_trickledown(struct binheap *bh, unsigned u)
+binheap_trickledown(const struct binheap *bh, unsigned u)
 {
 	unsigned v1, v2;
 
@@ -182,11 +182,11 @@
 	u = bh->next++;
 	bh->array[u] = p;
 	binheap_update(bh, u);
-	binheap_trickleup(bh, u);
+	(void)binheap_trickleup(bh, u);
 }
 
 void *
-binheap_root(struct binheap *bh)
+binheap_root(const struct binheap *bh)
 {
 
 	assert(bh != NULL);