From c673b8d96c2414eb2555c4f1405facdf0cd2ae68 Mon Sep 17 00:00:00 2001 From: des Date: Wed, 20 Sep 2006 07:51:04 +0000 Subject: [PATCH] Regenerate. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1097 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/include/vcl.h | 16 +++--- varnish-cache/lib/libvcl/vcc_fixed_token.c | 65 +++++++++++----------- varnish-cache/lib/libvcl/vcc_obj.c | 2 +- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/varnish-cache/include/vcl.h b/varnish-cache/include/vcl.h index 2b8f8b5c..fa281c26 100644 --- a/varnish-cache/include/vcl.h +++ b/varnish-cache/include/vcl.h @@ -16,16 +16,16 @@ struct VCL_conf { unsigned magic; #define VCL_CONF_MAGIC 0x7406c509 /* from /dev/random */ - struct backend **backend; - unsigned nbackend; - struct vrt_ref *ref; - unsigned nref; - unsigned busy; + struct backend **backend; + unsigned nbackend; + struct vrt_ref *ref; + unsigned nref; + unsigned busy; - void *priv; + void *priv; - vcl_init_f *init_func; - vcl_fini_f *fini_func; + vcl_init_f *init_func; + vcl_fini_f *fini_func; vcl_func_f *recv_func; vcl_func_f *miss_func; diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c index 58a34bed..d7fd8ed6 100644 --- a/varnish-cache/lib/libvcl/vcc_fixed_token.c +++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c @@ -165,78 +165,78 @@ vcl_fixed_token(const char *p, const char **q) } return (0); case 'b': - if (p[0] == 'b' && p[1] == 'a' && p[2] == 'c' && - p[3] == 'k' && p[4] == 'e' && p[5] == 'n' && + if (p[0] == 'b' && p[1] == 'a' && p[2] == 'c' && + p[3] == 'k' && p[4] == 'e' && p[5] == 'n' && p[6] == 'd' && !isvar(p[7])) { *q = p + 7; return (T_BACKEND); } return (0); case 'c': - if (p[0] == 'c' && p[1] == 'a' && p[2] == 'l' && + if (p[0] == 'c' && p[1] == 'a' && p[2] == 'l' && p[3] == 'l' && !isvar(p[4])) { *q = p + 4; return (T_CALL); } return (0); case 'd': - if (p[0] == 'd' && p[1] == 'i' && p[2] == 's' && - p[3] == 'c' && p[4] == 'a' && p[5] == 'r' && + if (p[0] == 'd' && p[1] == 'i' && p[2] == 's' && + p[3] == 'c' && p[4] == 'a' && p[5] == 'r' && p[6] == 'd' && !isvar(p[7])) { *q = p + 7; return (T_DISCARD); } - if (p[0] == 'd' && p[1] == 'e' && p[2] == 'l' && - p[3] == 'i' && p[4] == 'v' && p[5] == 'e' && + if (p[0] == 'd' && p[1] == 'e' && p[2] == 'l' && + p[3] == 'i' && p[4] == 'v' && p[5] == 'e' && p[6] == 'r' && !isvar(p[7])) { *q = p + 7; return (T_DELIVER); } return (0); case 'e': - if (p[0] == 'e' && p[1] == 'r' && p[2] == 'r' && + if (p[0] == 'e' && p[1] == 'r' && p[2] == 'r' && p[3] == 'o' && p[4] == 'r' && !isvar(p[5])) { *q = p + 5; return (T_ERROR); } - if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && + if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && p[3] == 'i' && p[4] == 'f' && !isvar(p[5])) { *q = p + 5; return (T_ELSIF); } - if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && + if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && p[3] == 'e' && p[4] == 'i' && p[5] == 'f' && !isvar(p[6])) { *q = p + 6; return (T_ELSEIF); } - if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && + if (p[0] == 'e' && p[1] == 'l' && p[2] == 's' && p[3] == 'e' && !isvar(p[4])) { *q = p + 4; return (T_ELSE); } return (0); case 'f': - if (p[0] == 'f' && p[1] == 'u' && p[2] == 'n' && + if (p[0] == 'f' && p[1] == 'u' && p[2] == 'n' && p[3] == 'c' && !isvar(p[4])) { *q = p + 4; return (T_FUNC); } - if (p[0] == 'f' && p[1] == 'e' && p[2] == 't' && + if (p[0] == 'f' && p[1] == 'e' && p[2] == 't' && p[3] == 'c' && p[4] == 'h' && !isvar(p[5])) { *q = p + 5; return (T_FETCH); } return (0); case 'i': - if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' && - p[3] == 'e' && p[4] == 'r' && p[5] == 't' && - p[6] == '_' && p[7] == 'p' && p[8] == 'a' && + if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' && + p[3] == 'e' && p[4] == 'r' && p[5] == 't' && + p[6] == '_' && p[7] == 'p' && p[8] == 'a' && p[9] == 's' && p[10] == 's' && !isvar(p[11])) { *q = p + 11; return (T_INSERT_PASS); } - if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' && + if (p[0] == 'i' && p[1] == 'n' && p[2] == 's' && p[3] == 'e' && p[4] == 'r' && p[5] == 't' && !isvar(p[6])) { *q = p + 6; @@ -248,7 +248,7 @@ vcl_fixed_token(const char *p, const char **q) } return (0); case 'l': - if (p[0] == 'l' && p[1] == 'o' && p[2] == 'o' && + if (p[0] == 'l' && p[1] == 'o' && p[2] == 'o' && p[3] == 'k' && p[4] == 'u' && p[5] == 'p' && !isvar(p[6])) { *q = p + 6; @@ -256,51 +256,51 @@ vcl_fixed_token(const char *p, const char **q) } return (0); case 'n': - if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' && - p[3] == 'n' && p[4] == 'e' && p[5] == 'w' && - p[6] == '_' && p[7] == 'c' && p[8] == 'a' && + if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' && + p[3] == 'n' && p[4] == 'e' && p[5] == 'w' && + p[6] == '_' && p[7] == 'c' && p[8] == 'a' && p[9] == 'c' && p[10] == 'h' && p[11] == 'e' && !isvar(p[12])) { *q = p + 12; return (T_NO_NEW_CACHE); } - if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' && - p[3] == 'c' && p[4] == 'a' && p[5] == 'c' && + if (p[0] == 'n' && p[1] == 'o' && p[2] == '_' && + p[3] == 'c' && p[4] == 'a' && p[5] == 'c' && p[6] == 'h' && p[7] == 'e' && !isvar(p[8])) { *q = p + 8; return (T_NO_CACHE); } return (0); case 'p': - if (p[0] == 'p' && p[1] == 'r' && p[2] == 'o' && + if (p[0] == 'p' && p[1] == 'r' && p[2] == 'o' && p[3] == 'c' && !isvar(p[4])) { *q = p + 4; return (T_PROC); } - if (p[0] == 'p' && p[1] == 'i' && p[2] == 'p' && + if (p[0] == 'p' && p[1] == 'i' && p[2] == 'p' && p[3] == 'e' && !isvar(p[4])) { *q = p + 4; return (T_PIPE); } - if (p[0] == 'p' && p[1] == 'a' && p[2] == 's' && + if (p[0] == 'p' && p[1] == 'a' && p[2] == 's' && p[3] == 's' && !isvar(p[4])) { *q = p + 4; return (T_PASS); } return (0); case 'r': - if (p[0] == 'r' && p[1] == 'e' && p[2] == 'w' && - p[3] == 'r' && p[4] == 'i' && p[5] == 't' && + if (p[0] == 'r' && p[1] == 'e' && p[2] == 'w' && + p[3] == 'r' && p[4] == 'i' && p[5] == 't' && p[6] == 'e' && !isvar(p[7])) { *q = p + 7; return (T_REWRITE); } return (0); case 's': - if (p[0] == 's' && p[1] == 'w' && p[2] == 'i' && - p[3] == 't' && p[4] == 'c' && p[5] == 'h' && - p[6] == '_' && p[7] == 'c' && p[8] == 'o' && - p[9] == 'n' && p[10] == 'f' && p[11] == 'i' && + if (p[0] == 's' && p[1] == 'w' && p[2] == 'i' && + p[3] == 't' && p[4] == 'c' && p[5] == 'h' && + p[6] == '_' && p[7] == 'c' && p[8] == 'o' && + p[9] == 'n' && p[10] == 'f' && p[11] == 'i' && p[12] == 'g' && !isvar(p[13])) { *q = p + 13; return (T_SWITCH_CONFIG); @@ -494,7 +494,6 @@ vcl_output_lang_h(FILE *f) fputs(" * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n", f); fputs(" * SUCH DAMAGE.\n", f); fputs(" *\n", f); - fputs(" *\n", f); fputs(" * $Id$\n", f); fputs(" *\n", f); fputs(" * Runtime support for compiled VCL programs.\n", f); diff --git a/varnish-cache/lib/libvcl/vcc_obj.c b/varnish-cache/lib/libvcl/vcc_obj.c index f6aa5d36..6b12473d 100644 --- a/varnish-cache/lib/libvcl/vcc_obj.c +++ b/varnish-cache/lib/libvcl/vcc_obj.c @@ -69,7 +69,7 @@ struct var vcc_vars[] = { { NULL } }; -const char *vrt_obj_h = +const char *vrt_obj_h = "/*\n" " * $Id$\n" " *\n" -- 2.39.5