Make sure we get the right assert() macro.

Constification.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2404 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/binary_heap.h b/varnish-cache/include/binary_heap.h
index f4beb09c79f2013505b5061710cb0b31da05d6e3..e31b77f1a7ef3430bcd3ced4b583c5c3bf9adc40 100644 (file)
--- a/varnish-cache/include/binary_heap.h
+++ b/varnish-cache/include/binary_heap.h
@@ -69,7 +69,7 @@ void binheap_delete(struct binheap *, unsigned idx);
         * The root item has 'idx' zero
         */
 
-void *binheap_root(struct binheap *);
+void *binheap_root(const struct binheap *);
        /*
         * Return the root item
         */

diff --git a/varnish-cache/lib/libvarnish/binary_heap.c b/varnish-cache/lib/libvarnish/binary_heap.c
index 0cf5dbb053b667120515dd07e653a930971e5b9c..5589d8369083bb354dd254c70c6573b7f001642e 100644 (file)
--- a/varnish-cache/lib/libvarnish/binary_heap.c
+++ b/varnish-cache/lib/libvarnish/binary_heap.c
@@ -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 @@ struct binheap {
 /* 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 @@ binheap_new(void *priv, binheap_cmp_t *cmp_f, binheap_update_t *update_f)
 }
 
 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 @@ binhead_swap(struct binheap *bh, unsigned u, unsigned v)
 }
 
 static unsigned
-binheap_trickleup(struct binheap *bh, unsigned u)
+binheap_trickleup(const struct binheap *bh, unsigned u)
 {
        unsigned v;
 
@@ -129,7 +129,7 @@ binheap_trickleup(struct binheap *bh, unsigned u)
 }
 
 static void
-binheap_trickledown(struct binheap *bh, unsigned u)
+binheap_trickledown(const struct binheap *bh, unsigned u)
 {
        unsigned v1, v2;
 
@@ -182,11 +182,11 @@ binheap_insert(struct binheap *bh, void *p)
        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);