Don't call functions outside the VRT namespace, even if this means

that we have to wrap strcmp().

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

diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index f3bdaed33939abddc5fa6b913d0771f3498c605c..ca3ee0f61502e3cd55364d87b2e2ae10c2993c98 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -501,6 +501,17 @@ VRT_purge(const char *regexp, int hash)
        AddBan(regexp, hash);
 }
 
+/*--------------------------------------------------------------------
+ * Simple stuff
+ */
+
+int
+VRT_strcmp(const char *s1, const char *s2)
+{
+       return (strcmp(s1, s2));
+}
+
+
 /*--------------------------------------------------------------------
  * Backend stuff, should probably move to its own file eventually
  */

diff --git a/varnish-cache/include/vrt.h b/varnish-cache/include/vrt.h
index d0049a4313a23d0eac55f00b3336aed571e7e524..2e3f8769db2302551628d1d0329e665e34d9314c 100644 (file)
--- a/varnish-cache/include/vrt.h
+++ b/varnish-cache/include/vrt.h
@@ -88,6 +88,10 @@ char *VRT_GetHdr(struct sess *, enum gethdr_e where, const char *);
 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_init_simple_backend(struct backend **, struct vrt_simple_backend *);
 void VRT_fini_backend(struct backend *);

diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c
index bbf44f2db5e77e0731be6c17d43f297868514736..992116d1e3b32f31deed75c0df1c335a99fb00fc 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c
@@ -446,6 +446,10 @@ vcl_output_lang_h(struct vsb *sb)
        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_init_simple_backend(struct backend **, struct vrt_simple_backend *);\n");
        vsb_cat(sb, "void VRT_fini_backend(struct backend *);\n");

diff --git a/varnish-cache/lib/libvcl/vcc_parse.c b/varnish-cache/lib/libvcl/vcc_parse.c
index 189b30013d76b385a10d8218fd4f24582a3daff9..bf5d7269d74094e5d605987b825df0889f7d4e4b 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_parse.c
+++ b/varnish-cache/lib/libvcl/vcc_parse.c
@@ -232,7 +232,7 @@ Cond_String(const struct var *vp, struct tokenlist *tl)
                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);