From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 20 Jun 2006 11:39:20 +0000 (+0000)
Subject: Rename vcl_lang.h to vcl.h and include practically nowhere.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e2d4feaaf70d7c6850b9b82a2496d415b245fe1;p=varnish

Rename vcl_lang.h to vcl.h and include practically nowhere.

Remove #include bogohandling in vcl_gen_fixed_token.tcl



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

diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index a00cb0b9..8bdb0356 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -41,7 +41,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 /* A backend connection */
diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index b227702f..cf915bb1 100644
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -20,7 +20,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 /*
diff --git a/varnish-cache/bin/varnishd/cache_main.c b/varnish-cache/bin/varnishd/cache_main.c
index 7e9fa23c..37d3493c 100644
--- a/varnish-cache/bin/varnishd/cache_main.c
+++ b/varnish-cache/bin/varnishd/cache_main.c
@@ -19,7 +19,6 @@
 #include "libvarnish.h"
 #include "heritage.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 #include "cli_event.h"
 
diff --git a/varnish-cache/bin/varnishd/cache_pass.c b/varnish-cache/bin/varnishd/cache_pass.c
index 7e3d9911..6ea20253 100644
--- a/varnish-cache/bin/varnishd/cache_pass.c
+++ b/varnish-cache/bin/varnishd/cache_pass.c
@@ -19,7 +19,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 
diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index cfcf7d8f..8a4077c1 100644
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -15,7 +15,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 struct edir {
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 5051097f..93e7d8e6 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -16,7 +16,7 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
+#include "vcl.h"
 #include "cache.h"
 
 static TAILQ_HEAD(, sess) shd = TAILQ_HEAD_INITIALIZER(shd);
diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index 4a503315..3858cf02 100644
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -13,7 +13,7 @@
 #include "cli.h"
 #include "cli_priv.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
+#include "vcl.h"
 #include "libvarnish.h"
 #include "cache.h"
 
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 3c030907..89f76230 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -17,8 +17,8 @@
 #include "cli_priv.h"
 #include "shmlog.h"
 #include "vrt.h"
+#include "vcl.h"
 #include "libvarnish.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 /*--------------------------------------------------------------------*/
diff --git a/varnish-cache/bin/varnishd/hash_simple_list.c b/varnish-cache/bin/varnishd/hash_simple_list.c
index f73152e7..aebe2612 100644
--- a/varnish-cache/bin/varnishd/hash_simple_list.c
+++ b/varnish-cache/bin/varnishd/hash_simple_list.c
@@ -10,7 +10,6 @@
 #include <sys/queue.h>
 
 #include <libvarnish.h>
-#include <vcl_lang.h>
 #include <cache.h>
 
 struct hsl_entry {
diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index d95e72a2..51bdd944 100644
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "vcl_lang.h"
 
 #include "cache.h"
 #include "libvarnish.h"
diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 060e9daf..bd0902d1 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -21,7 +21,6 @@
 #include <sys/mman.h>
 #include <sys/socket.h>
 
-#include "vcl_lang.h"
 #include "libvarnish.h"
 #include "cache.h"
 
diff --git a/varnish-cache/bin/varnishd/storage_malloc.c b/varnish-cache/bin/varnishd/storage_malloc.c
index 3bae30bc..7f928e55 100644
--- a/varnish-cache/bin/varnishd/storage_malloc.c
+++ b/varnish-cache/bin/varnishd/storage_malloc.c
@@ -9,7 +9,6 @@
 #include <sys/queue.h>
 #include <pthread.h>
 
-#include "vcl_lang.h"
 #include "cache.h"
 
 struct sma {
diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 9e11540d..cd5b0e63 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -25,8 +25,6 @@
 #include <libvarnish.h>
 #include <libvcl.h>
 
-#include "vcl_lang.h"
-
 #include "mgt.h"
 #include "heritage.h"
 #include "cli_event.h"
diff --git a/varnish-cache/include/vcl_lang.h b/varnish-cache/include/vcl.h
similarity index 90%
rename from varnish-cache/include/vcl_lang.h
rename to varnish-cache/include/vcl.h
index 22863562..0fbe70af 100644
--- a/varnish-cache/include/vcl_lang.h
+++ b/varnish-cache/include/vcl.h
@@ -1,5 +1,7 @@
 /*
- * Stuff necessary to compile a VCL programs C code
+ * $Id$
+ *
+ * Interface to a compiled VCL program.
  *
  * XXX: When this file is changed, lib/libvcl/vcl_gen_fixed_token.tcl
  * XXX: *MUST* be rerun.
diff --git a/varnish-cache/include/vrt.h b/varnish-cache/include/vrt.h
index 49d05fe2..c9e9dcdd 100644
--- a/varnish-cache/include/vrt.h
+++ b/varnish-cache/include/vrt.h
@@ -1,5 +1,6 @@
-/* $Id$ */
 /*
+ * $Id$ 
+ *
  * Runtime support for compiled VCL programs.
  *
  * XXX: When this file is changed, lib/libvcl/vcl_gen_fixed_token.tcl
diff --git a/varnish-cache/lib/libvcl/vcl_fixed_token.c b/varnish-cache/lib/libvcl/vcl_fixed_token.c
index be7cbe58..f51309fd 100644
--- a/varnish-cache/lib/libvcl/vcl_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcl_fixed_token.c
@@ -398,7 +398,9 @@ void
 vcl_output_lang_h(FILE *f)
 {
 	fputs("/*\n", f);
-	fputs(" * Stuff necessary to compile a VCL programs C code\n", f);
+	fputs(" * $Id$\n", f);
+	fputs(" *\n", f);
+	fputs(" * Interface to a compiled VCL program.\n", f);
 	fputs(" *\n", f);
 	fputs(" * XXX: When this file is changed, lib/libvcl/vcl_gen_fixed_token.tcl\n", f);
 	fputs(" * XXX: *MUST* be rerun.\n", f);
@@ -423,8 +425,9 @@ vcl_output_lang_h(FILE *f)
 	fputs("	unsigned	nref;\n", f);
 	fputs("	unsigned	busy;\n", f);
 	fputs("};\n", f);
-	fputs("/* $Id$ */\n", f);
 	fputs("/*\n", f);
+	fputs(" * $Id$ \n", f);
+	fputs(" *\n", f);
 	fputs(" * Runtime support for compiled VCL programs.\n", f);
 	fputs(" *\n", f);
 	fputs(" * XXX: When this file is changed, lib/libvcl/vcl_gen_fixed_token.tcl\n", f);
@@ -441,6 +444,7 @@ vcl_output_lang_h(FILE *f)
 	fputs("\n", f);
 	fputs("struct sess;\n", f);
 	fputs("struct backend;\n", f);
+	fputs("struct VCL_conf;\n", f);
 	fputs("\n", f);
 	fputs("struct vrt_ref {\n", f);
 	fputs("	unsigned	line;\n", f);
diff --git a/varnish-cache/lib/libvcl/vcl_gen_fixed_token.tcl b/varnish-cache/lib/libvcl/vcl_gen_fixed_token.tcl
index d345f0e8..77259bfa 100755
--- a/varnish-cache/lib/libvcl/vcl_gen_fixed_token.tcl
+++ b/varnish-cache/lib/libvcl/vcl_gen_fixed_token.tcl
@@ -183,16 +183,6 @@ proc copy_include {n} {
 
 	set fi [open $n]
 	while {[gets $fi a] >= 0} {
-		if {"$a" == "#include <http_headers.h>"} {
-			puts "FOO $a"
-			set fx [open "../../include/http_headers.h"]
-			while {[gets $fx b] >= 0} {
-				regsub -all {"} $b {\"} b
-				puts $fo "\tfputs(\"$b\\n\", f);"
-			}
-			close $fx
-			continue
-		}
 		regsub -all {\\} $a {\\\\} a
 		puts $fo "\tfputs(\"$a\\n\", f);"
 	}
@@ -203,7 +193,7 @@ puts $fo ""
 puts $fo "void"
 puts $fo "vcl_output_lang_h(FILE *f)"
 puts $fo "{"
-copy_include ../../include/vcl_lang.h
+copy_include ../../include/vcl.h
 copy_include ../../include/vrt.h
 
 puts $fo "}"