r1986 - in branches/1.1: . bin/varnishd include lib/libvcl

[des at projects.linpro.no]

Author: des
Date: 2007-09-23 15:05:46 +0200 (Sun, 23 Sep 2007)
New Revision: 1986

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache_vrt.c
   branches/1.1/include/vrt.h
   branches/1.1/lib/libvcl/vcc_fixed_token.c
   branches/1.1/lib/libvcl/vcc_parse.c
Log:
Merged revisions 1830 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1830 | phk | 2007-08-10 12:28:08 +0200 (Fri, 10 Aug 2007) | 4 lines
  
  Don't call functions outside the VRT namespace, even if this means
  that we have to wrap strcmp().
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949

Modified: branches/1.1/bin/varnishd/cache_vrt.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vrt.c	2007-09-23 13:04:20 UTC (rev 1985)
+++ branches/1.1/bin/varnishd/cache_vrt.c	2007-09-23 13:05:46 UTC (rev 1986)
@@ -532,3 +532,13 @@
 	
 	AddBan(regexp);
 }
+
+/*--------------------------------------------------------------------
+ * Simple stuff
+ */
+
+int
+VRT_strcmp(const char *s1, const char *s2)
+{
+	return (strcmp(s1, s2));
+}

Modified: branches/1.1/include/vrt.h
===================================================================
--- branches/1.1/include/vrt.h	2007-09-23 13:04:20 UTC (rev 1985)
+++ branches/1.1/include/vrt.h	2007-09-23 13:05:46 UTC (rev 1986)
@@ -82,6 +82,10 @@
 void VRT_SetHdr(struct sess *, enum gethdr_e where, const char *, const char *, ...);
 void VRT_handling(struct sess *sp, unsigned hand);
 
+/* Simple stuff */
+int VRT_strcmp(const char *s1, const char *s2);
+
+
 /* Backend related */
 void VRT_set_backend_name(struct backend *, const char *);
 void VRT_alloc_backends(struct VCL_conf *cp);

Modified: branches/1.1/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_fixed_token.c	2007-09-23 13:04:20 UTC (rev 1985)
+++ branches/1.1/lib/libvcl/vcc_fixed_token.c	2007-09-23 13:05:46 UTC (rev 1986)
@@ -440,6 +440,10 @@
 	vsb_cat(sb, "void VRT_SetHdr(struct sess *, enum gethdr_e where, const char *, const char *, ...);\n");
 	vsb_cat(sb, "void VRT_handling(struct sess *sp, unsigned hand);\n");
 	vsb_cat(sb, "\n");
+	vsb_cat(sb, "/* Simple stuff */\n");
+	vsb_cat(sb, "int VRT_strcmp(const char *s1, const char *s2);\n");
+	vsb_cat(sb, "\n");
+	vsb_cat(sb, "\n");
 	vsb_cat(sb, "/* Backend related */\n");
 	vsb_cat(sb, "void VRT_set_backend_name(struct backend *, const char *);\n");
 	vsb_cat(sb, "void VRT_alloc_backends(struct VCL_conf *cp);\n");

Modified: branches/1.1/lib/libvcl/vcc_parse.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_parse.c	2007-09-23 13:04:20 UTC (rev 1985)
+++ branches/1.1/lib/libvcl/vcc_parse.c	2007-09-23 13:05:46 UTC (rev 1986)
@@ -232,7 +232,7 @@
 		break;
 	case T_EQ:
 	case T_NEQ:
-		Fb(tl, 1, "%sstrcmp(%s, ",
+		Fb(tl, 1, "%sVRT_strcmp(%s, ",
 		    tl->t->tok == T_EQ ? "!" : "", vp->rname);
 		vcc_NextToken(tl);
 		ExpectErr(tl, CSTR);