r2552 - trunk/varnish-cache/lib/libvcl

[des at projects.linpro.no]

Author: des
Date: 2008-03-04 12:02:25 +0100 (Tue, 04 Mar 2008)
New Revision: 2552

Modified:
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
   trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
   trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
Define obj.hash in the correct place, and regen.


Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2008-03-04 10:59:32 UTC (rev 2551)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2008-03-04 11:02:25 UTC (rev 2552)
@@ -541,6 +541,7 @@
 	vsb_cat(sb, "double VRT_r_obj_prefetch(const struct sess *);\n");
 	vsb_cat(sb, "void VRT_l_obj_prefetch(const struct sess *, double);\n");
 	vsb_cat(sb, "double VRT_r_obj_lastuse(const struct sess *);\n");
+	vsb_cat(sb, "const char *VRT_r_obj_hash(struct sess *sp);\n");
 	vsb_cat(sb, "const char * VRT_r_resp_proto(const struct sess *);\n");
 	vsb_cat(sb, "void VRT_l_resp_proto(const struct sess *, const char *, ...);\n");
 	vsb_cat(sb, "int VRT_r_resp_status(const struct sess *);\n");

Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl	2008-03-04 10:59:32 UTC (rev 2551)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_obj.tcl	2008-03-04 11:02:25 UTC (rev 2552)
@@ -170,6 +170,10 @@
 		{                         hit fetch deliver discard timeout}
 		"const struct sess *"
 	}
+	{ obj.hash
+		RO STRING
+		{                    miss hit fetch deliver                }
+	}
 
 	# The response we send back
 	{ resp.proto

Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c	2008-03-04 10:59:32 UTC (rev 2551)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c	2008-03-04 11:02:25 UTC (rev 2552)
@@ -179,9 +179,9 @@
 	    0,
 	    VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER | VCL_MET_DISCARD | VCL_MET_TIMEOUT
 	},
-	{ "obj.hash", HASH, 8,
+	{ "obj.hash", STRING, 8,
+	    "VRT_r_obj_hash(sp)",
 	    NULL,
-	    "VRT_l_req_hash(sp, ",
 	    V_RO,
 	    0,
 	    VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER