Rename the VCL compilers public functions to VCC prefix

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

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 85f687f395a67bfdf0e12fd588cc29a0c7612d51..9e11540d8f09385b9ad7f131724db2e67aca2734 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -113,7 +113,7 @@ vcl_default(const char *bflag)
        assert(buf != NULL);
        sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
        assert(sb != NULL);
-       vf = VCL_Compile(sb, buf, NULL);
+       vf = VCC_Compile(sb, buf, NULL);
        sbuf_finish(sb);
        if (sbuf_len(sb) > 0) {
                fprintf(stderr, "%s", sbuf_data(sb));
@@ -134,7 +134,7 @@ cli_func_config_inline(struct cli *cli, char **av, void *priv __unused)
 
        sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
        assert(sb != NULL);
-       vf = VCL_Compile(sb, av[3], NULL);
+       vf = VCC_Compile(sb, av[3], NULL);
        sbuf_finish(sb);
        if (sbuf_len(sb) > 0) {
                cli_out(cli, "%s", sbuf_data(sb));
@@ -156,7 +156,7 @@ m_cli_func_config_load(struct cli *cli, char **av, void *priv __unused)
 
        sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
        assert(sb != NULL);
-       vf = VCL_CompileFile(sb, av[3]);
+       vf = VCC_CompileFile(sb, av[3]);
        sbuf_finish(sb);
        if (sbuf_len(sb) > 0) {
                cli_out(cli, "%s", sbuf_data(sb));
@@ -177,7 +177,7 @@ vcl_file(const char *fflag)
 
        sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
        assert(sb != NULL);
-       vf = VCL_CompileFile(sb, fflag);
+       vf = VCC_CompileFile(sb, fflag);
        sbuf_finish(sb);
        if (sbuf_len(sb) > 0) {
                fprintf(stderr, "%s", sbuf_data(sb));
@@ -392,7 +392,7 @@ main(int argc, char *argv[])
 
        register_printf_render_std((const unsigned char *)"HVQ");
  
-       VCL_InitCompile();
+       VCC_InitCompile();
 
        while ((o = getopt(argc, argv, "b:df:p:s:")) != -1)
                switch (o) {

diff --git a/varnish-cache/include/libvcl.h b/varnish-cache/include/libvcl.h
index 5e0e5557ea0af9cf539d3e6f6ee7aa48a1ce47e3..65e1fa7a35553709b4dcb05f44db2174b32791d6 100644 (file)
--- a/varnish-cache/include/libvcl.h
+++ b/varnish-cache/include/libvcl.h
@@ -2,8 +2,8 @@
  * $Id$
  */
 
-char *VCL_Compile(struct sbuf *sb, const char *b, const char *e);
-char *VCL_CompileFile(struct sbuf *sb, const char *fn);
-void VCL_InitCompile(void);
+char *VCC_Compile(struct sbuf *sb, const char *b, const char *e);
+char *VCC_CompileFile(struct sbuf *sb, const char *fn);
+void VCC_InitCompile(void);
 
 

diff --git a/varnish-cache/lib/libvcl/vcl_compile.c b/varnish-cache/lib/libvcl/vcl_compile.c
index 99313cb86ae7fd12f323138824f22a407ff09ae8..f3b63d245d4d15ab51242dd7e3b58aeed0c80be9 100644 (file)
--- a/varnish-cache/lib/libvcl/vcl_compile.c
+++ b/varnish-cache/lib/libvcl/vcl_compile.c
@@ -1599,7 +1599,7 @@ EmitStruct(struct tokenlist *tl)
 /*--------------------------------------------------------------------*/
 
 char *
-VCL_Compile(struct sbuf *sb, const char *b, const char *e)
+VCC_Compile(struct sbuf *sb, const char *b, const char *e)
 {
        struct tokenlist tokens;
        struct ref *r;
@@ -1684,7 +1684,7 @@ done:
 /*--------------------------------------------------------------------*/
 
 char *
-VCL_CompileFile(struct sbuf *sb, const char *fn)
+VCC_CompileFile(struct sbuf *sb, const char *fn)
 {
        char *f, *r;
        int fd, i;
@@ -1702,7 +1702,7 @@ VCL_CompileFile(struct sbuf *sb, const char *fn)
        i = read(fd, f, st.st_size); 
        assert(i == st.st_size);
        f[i] = '\0';
-       r = VCL_Compile(sb, f, NULL);
+       r = VCC_Compile(sb, f, NULL);
        free(f);
        return (r);
 }
@@ -1710,7 +1710,7 @@ VCL_CompileFile(struct sbuf *sb, const char *fn)
 /*--------------------------------------------------------------------*/
 
 void
-VCL_InitCompile(void)
+VCC_InitCompile(void)
 {
        struct var *v;