Relax assertions, and fix the build.

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

diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index fcc6b6dba2fdf5318b48cc827f0e94f64fcfa115..b15d32774c3fea847d8a5360c8ec6ddfe6bbcfe7 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -540,11 +540,15 @@ VRT_r_obj_lastuse(const struct sess *sp)
 }
 
 const char *
-VRT_r_obj_hash(struct sess *sp)
+VRT_r_obj_hash(const struct sess *sp)
 {
 
        CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+       if (sp->obj == NULL)
+               return (NULL);
        CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
+       if (sp->obj->objhead == NULL)
+               return (NULL);
        CHECK_OBJ_NOTNULL(sp->obj->objhead, OBJHEAD_MAGIC);
        return (sp->obj->objhead->hash);
 }

diff --git a/varnish-cache/include/vrt_obj.h b/varnish-cache/include/vrt_obj.h
index d7f8eb72fc26f6a29a05ba8755ff4f75ec9e6c3d..24b5a9a9285d65ebb3acd21f7c691151fa5d4b89 100644 (file)
--- a/varnish-cache/include/vrt_obj.h
+++ b/varnish-cache/include/vrt_obj.h
@@ -43,7 +43,7 @@ void VRT_l_obj_grace(const struct sess *, double);
 double VRT_r_obj_prefetch(const struct sess *);
 void VRT_l_obj_prefetch(const struct sess *, double);
 double VRT_r_obj_lastuse(const struct sess *);
-const char * VRT_r_obj_hash();
+const char * VRT_r_obj_hash(const struct sess *);
 const char * VRT_r_resp_proto(const struct sess *);
 void VRT_l_resp_proto(const struct sess *, const char *, ...);
 int VRT_r_resp_status(const struct sess *);

diff --git a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
index 0e0c73b8423cb30c2afb27cfd7afaefebb8554b6..08ce82a28f5bf0df04948d1eb85282e4fca6cec8 100755 (executable)
--- a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
@@ -173,6 +173,7 @@ set spobj {
        { obj.hash
                RO STRING
                {                    miss hit fetch deliver                }
+               "const struct sess *"
        }
 
        # The response we send back