r4693 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Mon Apr 19 14:40:31 CEST 2010
Author: tfheen
Date: 2010-04-19 14:40:31 +0200 (Mon, 19 Apr 2010)
New Revision: 4693
Modified:
branches/2.1/
branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
branches/2.1/varnish-cache/bin/varnishd/vparam.h
branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
branches/2.1/varnish-cache/include/vct.h
branches/2.1/varnish-cache/include/vev.h
branches/2.1/varnish-cache/lib/libvarnish/tcp.c
branches/2.1/varnish-cache/lib/libvarnish/vev.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
Log:
Merge r4665: Add vcc_ prefixes to a bunch of static functions.
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4664
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4665
Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4664
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4665
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c 2010-04-19 12:30:23 UTC (rev 4692)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c 2010-04-19 12:40:31 UTC (rev 4693)
@@ -43,8 +43,8 @@
/*--------------------------------------------------------------------*/
-static void Compound(struct tokenlist *tl);
-static void Cond_0(struct tokenlist *tl);
+static void vcc_Compound(struct tokenlist *tl);
+static void vcc_Cond_0(struct tokenlist *tl);
/*--------------------------------------------------------------------*/
@@ -64,7 +64,7 @@
*/
static double
-TimeUnit(struct tokenlist *tl)
+vcc_TimeUnit(struct tokenlist *tl)
{
double sc = 1.0;
@@ -97,7 +97,7 @@
*/
static double
-SizeUnit(struct tokenlist *tl)
+vcc_SizeUnit(struct tokenlist *tl)
{
double sc = 1.0;
@@ -186,7 +186,7 @@
v = vcc_DoubleVal(tl);
ERRCHK(tl);
ExpectErr(tl, ID);
- sc = TimeUnit(tl);
+ sc = vcc_TimeUnit(tl);
*d = sign * v * sc;
}
@@ -200,7 +200,7 @@
v = vcc_DoubleVal(tl);
ERRCHK(tl);
ExpectErr(tl, ID);
- sc = TimeUnit(tl);
+ sc = vcc_TimeUnit(tl);
*d = v * sc;
}
@@ -214,14 +214,14 @@
v = vcc_DoubleVal(tl);
ERRCHK(tl);
ExpectErr(tl, ID);
- sc = SizeUnit(tl);
+ sc = vcc_SizeUnit(tl);
*d = v * sc;
}
/*--------------------------------------------------------------------*/
static void
-Cond_String(const struct var *vp, struct tokenlist *tl)
+vcc_Cond_String(const struct var *vp, struct tokenlist *tl)
{
char *p;
@@ -255,7 +255,7 @@
}
static void
-Cond_Int(const struct var *vp, struct tokenlist *tl)
+vcc_Cond_Int(const struct var *vp, struct tokenlist *tl)
{
Fb(tl, 1, "%s ", vp->rname);
@@ -284,14 +284,14 @@
}
static void
-Cond_Bool(const struct var *vp, const struct tokenlist *tl)
+vcc_Cond_Bool(const struct var *vp, const struct tokenlist *tl)
{
Fb(tl, 1, "%s\n", vp->rname);
}
static void
-Cond_Backend(const struct var *vp, struct tokenlist *tl)
+vcc_Cond_Backend(const struct var *vp, struct tokenlist *tl)
{
Fb(tl, 1, "%s\n", vp->rname);
@@ -317,7 +317,7 @@
}
static void
-Cond_2(struct tokenlist *tl)
+vcc_Cond_2(struct tokenlist *tl)
{
struct var *vp;
@@ -330,7 +330,7 @@
}
if (tl->t->tok == '(') {
vcc_NextToken(tl);
- Cond_0(tl);
+ vcc_Cond_0(tl);
SkipToken(tl, ')');
} else if (tl->t->tok == VAR) {
vp = vcc_FindVar(tl, tl->t, vcc_vars);
@@ -338,14 +338,14 @@
assert(vp != NULL);
vcc_NextToken(tl);
switch (vp->fmt) {
- case INT: L(tl, Cond_Int(vp, tl)); break;
- case SIZE: L(tl, Cond_Int(vp, tl)); break;
- case BOOL: L(tl, Cond_Bool(vp, tl)); break;
+ case INT: L(tl, vcc_Cond_Int(vp, tl)); break;
+ case SIZE: L(tl, vcc_Cond_Int(vp, tl)); break;
+ case BOOL: L(tl, vcc_Cond_Bool(vp, tl)); break;
case IP: L(tl, vcc_Cond_Ip(vp, tl)); break;
- case STRING: L(tl, Cond_String(vp, tl)); break;
- case TIME: L(tl, Cond_Int(vp, tl)); break;
- case RTIME: L(tl, Cond_Int(vp, tl)); break;
- case BACKEND: L(tl, Cond_Backend(vp, tl)); break;
+ case STRING: L(tl, vcc_Cond_String(vp, tl)); break;
+ case TIME: L(tl, vcc_Cond_Int(vp, tl)); break;
+ case RTIME: L(tl, vcc_Cond_Int(vp, tl)); break;
+ case BACKEND: L(tl, vcc_Cond_Backend(vp, tl)); break;
default:
vsb_printf(tl->sb,
"Variable '%s'"
@@ -367,40 +367,40 @@
}
static void
-Cond_1(struct tokenlist *tl)
+vcc_Cond_1(struct tokenlist *tl)
{
Fb(tl, 1, "(\n");
- L(tl, Cond_2(tl));
+ L(tl, vcc_Cond_2(tl));
while (tl->t->tok == T_CAND) {
vcc_NextToken(tl);
Fb(tl, 1, ") && (\n");
- L(tl, Cond_2(tl));
+ L(tl, vcc_Cond_2(tl));
}
Fb(tl, 1, ")\n");
}
static void
-Cond_0(struct tokenlist *tl)
+vcc_Cond_0(struct tokenlist *tl)
{
Fb(tl, 1, "(\n");
- L(tl, Cond_1(tl));
+ L(tl, vcc_Cond_1(tl));
while (tl->t->tok == T_COR) {
vcc_NextToken(tl);
Fb(tl, 1, ") || (\n");
- L(tl, Cond_1(tl));
+ L(tl, vcc_Cond_1(tl));
}
Fb(tl, 1, ")\n");
}
static void
-Conditional(struct tokenlist *tl)
+vcc_Conditional(struct tokenlist *tl)
{
SkipToken(tl, '(');
Fb(tl, 1, "(\n");
- L(tl, Cond_0(tl));
+ L(tl, vcc_Cond_0(tl));
ERRCHK(tl);
Fb(tl, 1, ")\n");
SkipToken(tl, ')');
@@ -409,14 +409,14 @@
/*--------------------------------------------------------------------*/
static void
-IfStmt(struct tokenlist *tl)
+vcc_IfStmt(struct tokenlist *tl)
{
SkipToken(tl, T_IF);
Fb(tl, 1, "if \n");
- L(tl, Conditional(tl));
+ L(tl, vcc_Conditional(tl));
ERRCHK(tl);
- L(tl, Compound(tl));
+ L(tl, vcc_Compound(tl));
ERRCHK(tl);
while (1) {
switch (tl->t->tok) {
@@ -424,7 +424,7 @@
vcc_NextToken(tl);
if (tl->t->tok != T_IF) {
Fb(tl, 1, "else \n");
- L(tl, Compound(tl));
+ L(tl, vcc_Compound(tl));
ERRCHK(tl);
return;
}
@@ -433,9 +433,9 @@
case T_ELSIF:
Fb(tl, 1, "else if \n");
vcc_NextToken(tl);
- L(tl, Conditional(tl));
+ L(tl, vcc_Conditional(tl));
ERRCHK(tl);
- L(tl, Compound(tl));
+ L(tl, vcc_Compound(tl));
ERRCHK(tl);
break;
default:
@@ -448,7 +448,7 @@
/*--------------------------------------------------------------------*/
static void
-Compound(struct tokenlist *tl)
+vcc_Compound(struct tokenlist *tl)
{
int i;
@@ -460,10 +460,10 @@
ERRCHK(tl);
switch (tl->t->tok) {
case '{':
- Compound(tl);
+ vcc_Compound(tl);
break;
case T_IF:
- IfStmt(tl);
+ vcc_IfStmt(tl);
break;
case '}':
vcc_NextToken(tl);
@@ -502,7 +502,7 @@
/*--------------------------------------------------------------------*/
static void
-Function(struct tokenlist *tl)
+vcc_Function(struct tokenlist *tl)
{
int m;
@@ -534,7 +534,7 @@
vcc_NextToken(tl);
tl->indent += INDENT;
Fb(tl, 1, "{\n");
- L(tl, Compound(tl));
+ L(tl, vcc_Compound(tl));
if (m == -1) {
/*
* non-method subroutines must have an explicit non-action
@@ -564,7 +564,7 @@
parse_f *func;
} toplev[] = {
{ "acl", vcc_Acl },
- { "sub", Function },
+ { "sub", vcc_Function },
{ "backend", vcc_ParseDirector },
{ "director", vcc_ParseDirector },
{ NULL, NULL }
More information about the varnish-commit
mailing list