r2716 - in trunk/varnish-cache: bin/varnishd bin/varnishlog bin/varnishtest lib/libvcl
phk at projects.linpro.no
phk at projects.linpro.no
Tue Jun 17 09:37:28 CEST 2008
Author: phk
Date: 2008-06-17 09:37:27 +0200 (Tue, 17 Jun 2008)
New Revision: 2716
Modified:
trunk/varnish-cache/bin/varnishd/cache_cli.c
trunk/varnish-cache/bin/varnishd/cache_vary.c
trunk/varnish-cache/bin/varnishd/mgt_cli.c
trunk/varnish-cache/bin/varnishd/mgt_vcc.c
trunk/varnish-cache/bin/varnishd/varnishd.c
trunk/varnish-cache/bin/varnishlog/varnishlog.c
trunk/varnish-cache/bin/varnishtest/vtc.c
trunk/varnish-cache/bin/varnishtest/vtc_http.c
trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
trunk/varnish-cache/lib/libvcl/vcc_compile.c
Log:
Use vsb_newauto() macro throughout
Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -142,7 +142,7 @@
cli = &clis;
memset(cli, 0, sizeof *cli);
- cli->sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ cli->sb = vsb_newauto();
XXXAN(cli->sb);
vlu = VLU_New(cli, cli_vlu, params->cli_buffer);
XXXAN(vlu);
Modified: trunk/varnish-cache/bin/varnishd/cache_vary.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vary.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishd/cache_vary.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -74,11 +74,11 @@
return;
/* For vary matching string */
- sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ sb = vsb_newauto();
AN(sb);
/* For header matching strings */
- sbh = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ sbh = vsb_newauto();
AN(sbh);
for (p = v; *p; p++) {
Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -353,7 +353,7 @@
cp->fdo = fdo;
cp->verbose = verbose;
- cp->cli->sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ cp->cli->sb = vsb_newauto();
XXXAN(cp->cli->sb);
cp->ev = calloc(sizeof *cp->ev, 1);
Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -402,7 +402,7 @@
struct vsb *sb;
struct vclprog *vp;
- sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ sb = vsb_newauto();
XXXAN(sb);
if (b_arg != NULL) {
/*
@@ -529,7 +529,7 @@
(void)priv;
- sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ sb = vsb_newauto();
XXXAN(sb);
vf = mgt_VccCompile(sb, av[3], NULL, 0);
vsb_finish(sb);
@@ -563,7 +563,7 @@
(void)priv;
- sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ sb = vsb_newauto();
XXXAN(sb);
vf = mgt_VccCompileFile(sb, av[3], 0, -1);
vsb_finish(sb);
Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -382,7 +382,7 @@
tzset();
memset(cli, 0, sizeof cli);
- cli[0].sb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ cli[0].sb = vsb_newauto();
XXXAN(cli[0].sb);
cli[0].result = CLIS_OK;
Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -134,7 +134,7 @@
return (0);
}
if (ob[fd] == NULL) {
- ob[fd] = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ ob[fd] = vsb_newauto();
assert(ob[fd] != NULL);
}
if (tag == match_tag &&
Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -53,7 +53,7 @@
if (pfx == NULL)
pfx = "";
- vsb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ vsb = vsb_newauto();
if (str == NULL)
vsb_printf(vsb, "#### %-4s %s(null)\n", ident, pfx);
else
Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -306,7 +306,7 @@
assert(!strcmp(av[0], "txresp"));
av++;
- vsb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ vsb = vsb_newauto();
for(; *av != NULL; av++) {
if (!strcmp(*av, "-proto")) {
@@ -407,7 +407,7 @@
assert(!strcmp(av[0], "txreq"));
av++;
- vsb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ vsb = vsb_newauto();
for(; *av != NULL; av++) {
if (!strcmp(*av, "-url")) {
Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -160,7 +160,7 @@
struct vsb *vsb;
int i;
- vsb = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ vsb = vsb_newauto();
AN(vsb);
vsb_printf(vsb, "cd ../varnishd &&");
vsb_printf(vsb, " ./varnishd -d -d -n %s", v->name);
Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.c 2008-06-17 07:32:43 UTC (rev 2715)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.c 2008-06-17 07:37:27 UTC (rev 2716)
@@ -490,24 +490,24 @@
tl->nsources = 0;
/* General C code */
- tl->fc = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ tl->fc = vsb_newauto();
assert(tl->fc != NULL);
/* Forward decls (.h like) */
- tl->fh = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ tl->fh = vsb_newauto();
assert(tl->fh != NULL);
/* Init C code */
- tl->fi = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ tl->fi = vsb_newauto();
assert(tl->fi != NULL);
/* Finish C code */
- tl->ff = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
+ tl->ff = vsb_newauto();
assert(tl->ff != NULL);
/* body code of methods */
for (i = 0; i < N_METHODS; i++) {
- tl->fm[i] = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND); \
+ tl->fm[i] = vsb_newauto();
assert(tl->fm[i] != NULL);
}
return (tl);
More information about the varnish-commit
mailing list