r4681 - 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 13:33:45 CEST 2010
Author: tfheen
Date: 2010-04-19 13:33:45 +0200 (Mon, 19 Apr 2010)
New Revision: 4681
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_acl.c
branches/2.1/varnish-cache/lib/libvcl/vcc_action.c
branches/2.1/varnish-cache/lib/libvcl/vcc_backend.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
branches/2.1/varnish-cache/lib/libvcl/vcc_var.c
Log:
Merge r4656: Make vcc_UintVal() behave like the other ..Val()
functions and consume its token.
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4655
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4656
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-4655
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4656
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c 2010-04-19 11:28:51 UTC (rev 4680)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_acl.c 2010-04-19 11:33:45 UTC (rev 4681)
@@ -306,7 +306,6 @@
ae->t_mask = tl->t;
ExpectErr(tl, CNUM);
ae->mask = vcc_UintVal(tl);
- vcc_NextToken(tl);
}
if (ae->para)
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_action.c 2010-04-19 11:28:51 UTC (rev 4680)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_action.c 2010-04-19 11:33:45 UTC (rev 4681)
@@ -101,7 +101,6 @@
}
} else if (tl->t->tok == CNUM) {
Fb(tl, 1, "VRT_error(sp, %u", vcc_UintVal(tl));
- vcc_NextToken(tl);
} else
Fb(tl, 1, "VRT_error(sp, 0");
if (tl->t->tok == CSTR) {
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_backend.c 2010-04-19 11:28:51 UTC (rev 4680)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_backend.c 2010-04-19 11:33:45 UTC (rev 4681)
@@ -304,12 +304,10 @@
} else if (vcc_IdIs(t_field, "window")) {
t_window = tl->t;
window = vcc_UintVal(tl);
- vcc_NextToken(tl);
ERRCHK(tl);
} else if (vcc_IdIs(t_field, "initial")) {
t_initial = tl->t;
initial = vcc_UintVal(tl);
- vcc_NextToken(tl);
ERRCHK(tl);
} else if (vcc_IdIs(t_field, "expected_response")) {
status = vcc_UintVal(tl);
@@ -320,12 +318,10 @@
vcc_ErrWhere(tl, tl->t);
return;
}
- vcc_NextToken(tl);
ERRCHK(tl);
} else if (vcc_IdIs(t_field, "threshold")) {
t_threshold = tl->t;
threshold = vcc_UintVal(tl);
- vcc_NextToken(tl);
ERRCHK(tl);
} else {
vcc_ErrToken(tl, t_field);
@@ -482,7 +478,6 @@
SkipToken(tl, ';');
} else if (vcc_IdIs(t_field, "max_connections")) {
u = vcc_UintVal(tl);
- vcc_NextToken(tl);
ERRCHK(tl);
SkipToken(tl, ';');
Fb(tl, 0, "\t.max_connections = %u,\n", u);
@@ -498,7 +493,6 @@
vsb_printf(tl->sb, " at\n");
vcc_ErrWhere(tl, tl->t);
}
- vcc_NextToken(tl);
ERRCHK(tl);
saint = u;
SkipToken(tl, ';');
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c 2010-04-19 11:28:51 UTC (rev 4680)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c 2010-04-19 11:33:45 UTC (rev 4681)
@@ -69,7 +69,6 @@
ExpectErr(tl, CNUM);
retries = vcc_UintVal(tl);
ERRCHK(tl);
- vcc_NextToken(tl);
SkipToken(tl, ';');
} else {
ErrInternal(tl);
@@ -113,7 +112,6 @@
return;
}
Fc(tl, 0, "%s .weight = %u", first, u);
- vcc_NextToken(tl);
SkipToken(tl, ';');
} else {
ErrInternal(tl);
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-4655
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4656
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c 2010-04-19 11:28:51 UTC (rev 4680)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c 2010-04-19 11:33:45 UTC (rev 4681)
@@ -137,6 +137,7 @@
d *= 10;
d += *p - '0';
}
+ vcc_NextToken(tl);
return (d);
}
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_var.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_var.c 2010-04-19 11:28:51 UTC (rev 4680)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_var.c 2010-04-19 11:33:45 UTC (rev 4681)
@@ -133,7 +133,6 @@
Fb(tl, 0, "%g", vcc_DoubleVal(tl));
} else if (vp->fmt == INT) {
Fb(tl, 0, "%u", vcc_UintVal(tl));
- vcc_NextToken(tl);
} else {
AN(vt);
vsb_printf(tl->sb,
More information about the varnish-commit
mailing list