Relax assertions, and fix the build.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@2554 d4fa192b-c00b-0410-8231-f00ffab90ce4

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);
 }

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 *);

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