r2435 - in trunk/varnish-cache: include lib/libvcl

phk at projects.linpro.no phk at projects.linpro.no
Wed Feb 6 10:43:22 CET 2008


Author: phk
Date: 2008-02-06 10:43:22 +0100 (Wed, 06 Feb 2008)
New Revision: 2435

Modified:
   trunk/varnish-cache/include/vrt.h
   trunk/varnish-cache/lib/libvcl/vcc_backend.c
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
Log:
I forgot to include the vcl_name of the random director in the structure.


Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h	2008-02-06 07:26:28 UTC (rev 2434)
+++ trunk/varnish-cache/include/vrt.h	2008-02-06 09:43:22 UTC (rev 2435)
@@ -71,9 +71,10 @@
 };
 
 struct vrt_dir_random {
+	const char 			*ident;
+	const char 			*name;
 	unsigned 			nmember;
 	const struct vrt_dir_random_entry	*members;
-	const char 			*ident;
 };
 
 struct vrt_random_backend {

Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2008-02-06 07:26:28 UTC (rev 2434)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2008-02-06 09:43:22 UTC (rev 2435)
@@ -425,6 +425,7 @@
 	Fc(tl, 0,
 	    "\nstatic const struct vrt_dir_random vdr_%.*s = {\n",
 	    PF(t_dir));
+	Fc(tl, 0, "\t.name = \"%.*s\",\n", PF(t_dir));
 	Fc(tl, 0, "\t.nmember = %d,\n", nelem);
 	Fc(tl, 0, "\t.members = vdre_%.*s,\n", PF(t_dir));
 	vcc_EmitBeIdent(tl->fc, t_first, tl->t);

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2008-02-06 07:26:28 UTC (rev 2434)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2008-02-06 09:43:22 UTC (rev 2435)
@@ -423,9 +423,10 @@
 	vsb_cat(sb, "};\n");
 	vsb_cat(sb, "\n");
 	vsb_cat(sb, "struct vrt_dir_random {\n");
+	vsb_cat(sb, "	const char 			*ident;\n");
+	vsb_cat(sb, "	const char 			*name;\n");
 	vsb_cat(sb, "	unsigned 			nmember;\n");
 	vsb_cat(sb, "	const struct vrt_dir_random_entry	*members;\n");
-	vsb_cat(sb, "	const char 			*ident;\n");
 	vsb_cat(sb, "};\n");
 	vsb_cat(sb, "\n");
 	vsb_cat(sb, "struct vrt_random_backend {\n");




More information about the varnish-commit mailing list