r209 - in trunk/varnish-cache: bin/varnishd include lib/libvcl

[phk at projects.linpro.no]

Author: phk
Date: 2006-06-20 11:28:00 +0200 (Tue, 20 Jun 2006)
New Revision: 209

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.c
   trunk/varnish-cache/include/libvcl.h
   trunk/varnish-cache/lib/libvcl/vcl_compile.c
Log:
Rename the VCL compilers public functions to VCC prefix


Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2006-06-20 09:25:21 UTC (rev 208)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2006-06-20 09:28:00 UTC (rev 209)
@@ -113,7 +113,7 @@
 	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 @@
 
 	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 @@
 
 	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 @@
 
 	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 @@
 
 	register_printf_render_std((const unsigned char *)"HVQ");
  
-	VCL_InitCompile();
+	VCC_InitCompile();
 
 	while ((o = getopt(argc, argv, "b:df:p:s:")) != -1)
 		switch (o) {

Modified: trunk/varnish-cache/include/libvcl.h
===================================================================
--- trunk/varnish-cache/include/libvcl.h	2006-06-20 09:25:21 UTC (rev 208)
+++ trunk/varnish-cache/include/libvcl.h	2006-06-20 09:28:00 UTC (rev 209)
@@ -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);
 
 

Modified: trunk/varnish-cache/lib/libvcl/vcl_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcl_compile.c	2006-06-20 09:25:21 UTC (rev 208)
+++ trunk/varnish-cache/lib/libvcl/vcl_compile.c	2006-06-20 09:28:00 UTC (rev 209)
@@ -1599,7 +1599,7 @@
 /*--------------------------------------------------------------------*/
 
 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 @@
 /*--------------------------------------------------------------------*/
 
 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 @@
 	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 @@
 /*--------------------------------------------------------------------*/
 
 void
-VCL_InitCompile(void)
+VCC_InitCompile(void)
 {
 	struct var *v;