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 a00cb0b96618357adb7ccb0fcaf7ac667921dafa..8bdb0356d7e1bbdb28eecd91253be764976f3ac3 100644 (file)
--- 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 b227702f9bc89b866060943d3b615c76ecc1b043..cf915bb12f1a6a8ce56fe096fe75e0a21e9a8320 100644 (file)
--- 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 7e9fa23c9fcde66c650b655a7d274a7d771a9972..37d3493cbc9b05ec55cf5c55a5e9899160dc4344 100644 (file)
--- 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 7e3d99112956c6aff05b2096b578fefd955966e6..6ea20253bad2462b3c04fb5327578cd9feeebfcf 100644 (file)
--- 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 cfcf7d8fd98d67eadb55ebbb98ff1fd85bb191be..8a4077c1ac266ecb90897d1a0e649dace4dea574 100644 (file)
--- 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 5051097f80b7e8f1b87778e3d94f890b105815b0..93e7d8e6d867596ebe24152561a679b2ae9245c0 100644 (file)
--- 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 4a5033155fb13590f6544b7a4ad3e38f10e61728..3858cf02b775065767246b981f92f2d56aeec2c2 100644 (file)
--- 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 3c03090728a9e4d80be3a83bf385be12d4c5f05f..89f762301591f308fe5bdcb9ebdcb996d31c00a8 100644 (file)
--- 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 f73152e7541bd20d9fc9f8785cf4e79f4c95d3f9..aebe26125c496956615a17947c74ee4cc5a2d1f1 100644 (file)
--- 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 d95e72a2d0f2859d68349d7ed05b2a86197f1c23..51bdd944dbf5268305654a94ddad16bea2d95128 100644 (file)
--- 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 060e9daf5bd4e27df7fe4973ed920d3ec1f50f22..bd0902d18e03302535b12f8ea6ec913e4a36a4cd 100644 (file)
--- 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 3bae30bcd4aafabf9da67716f9a1789a20d253e3..7f928e55f10e2c82513984c1b60aa227921c80d4 100644 (file)
--- 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 9e11540d8f09385b9ad7f131724db2e67aca2734..cd5b0e6330994fb23361b3a54941216c5636751e 100644 (file)
--- 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 2286356222c408c8153f4fd6dc34e21465fe6e0a..0fbe70afd40d707ce06d65bbd7be79358152fd33 100644 (file)
--- 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 49d05fe2c2369605ff0e76eeb7999c278dff5c7c..c9e9dcdd26b61ee23cb84964e311269d940f34c7 100644 (file)
--- 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 be7cbe58f96690b3d32a145d5d74b392306b08a5..f51309fdd39c5106fc86ed48f43777d534e9f3a5 100644 (file)
--- 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 d345f0e899f2efa101068707a1727c877a88b0cd..77259bfa0e7edb55f2735d76c8975d97070e001d 100755 (executable)
--- 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 "}"