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

Remove #include bogohandling in vcl_gen_fixed_token.tcl



git-svn-id: http://www.varnish-cache.org/svn/trunk@212 d4fa192b-c00b-0410-8231-f00ffab90ce4

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 */

bin/varnishd/cache_fetch.c

@@ -20,7 +20,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 /*

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"
 

bin/varnishd/cache_pass.c

@@ -19,7 +19,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 

bin/varnishd/cache_pipe.c

@@ -15,7 +15,6 @@
 
 #include "libvarnish.h"
 #include "shmlog.h"
-#include "vcl_lang.h"
 #include "cache.h"
 
 struct edir {

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);

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"
 

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"
 
 /*--------------------------------------------------------------------*/

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 {

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"

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"
 

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 {

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"

include/vcl_lang.h → include/vcl.h

 /*
- * 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.

include/vrt.h

-/* $Id$ */
 /*
+ * $Id$ 
+ *
  * Runtime support for compiled VCL programs.
  *
  * XXX: When this file is changed, lib/libvcl/vcl_gen_fixed_token.tcl

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);

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 "}"