Use vsb_newauto() macro throughout

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2716 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index 808f711e04be4f8456bc0e9a239a499296029dd8..aa4741c58a7643f66aa07ee91c55c8ab39824e6b 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -142,7 +142,7 @@ CLI_Run(void)
        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);

diff --git a/varnish-cache/bin/varnishd/cache_vary.c b/varnish-cache/bin/varnishd/cache_vary.c
index 2ad327421d76b78baa5bd0ea7290400efc16ebdf..abac54218faedd5b0aa2b2101f79126e25568959 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vary.c
+++ b/varnish-cache/bin/varnishd/cache_vary.c
@@ -74,11 +74,11 @@ VRY_Create(const struct sess *sp)
                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++) {

diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index 456659f901a0231e0152cc4b63bfce288230f022..cb93c11dc105bb17dfb158627ad7109b11ca972b 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -353,7 +353,7 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident)
        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);

diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index 2f95b21d1ebc20080e20b1e52f46bedd769a1563..ece530293bc790f92471779bb26262331eda87bc 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -402,7 +402,7 @@ mgt_vcc_default(const char *b_arg, const char *f_arg, int f_fd, int C_flag)
        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 @@ mcf_config_inline(struct cli *cli, const char * const *av, void *priv)
 
        (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 @@ mcf_config_load(struct cli *cli, const char * const *av, void *priv)
 
        (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);

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index a71a3c91e827e0261b09c3ab951a2eee7e070158..71cd40cbacff4345fa112e2ff984b397074fc221 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -382,7 +382,7 @@ main(int argc, char *argv[])
        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;
 

diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index 481f2f5eebde6d1876ecf8c938c425270e0b7582..430143358f9e038db12e79f1c270f50d354bdbd0 100644 (file)
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -134,7 +134,7 @@ h_order(void *priv, enum shmlogtag tag, unsigned fd, unsigned len, unsigned spec
                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 &&

diff --git a/varnish-cache/bin/varnishtest/vtc.c b/varnish-cache/bin/varnishtest/vtc.c
index 249f9752b2afef1f50efe760d3480315f050c276..7950fd8d003c0bbb00f564f4d0a3de0e7e1c243a 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc.c
+++ b/varnish-cache/bin/varnishtest/vtc.c
@@ -53,7 +53,7 @@ vct_dump(const char *ident, const char *pfx, const char *str)
 
        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

diff --git a/varnish-cache/bin/varnishtest/vtc_http.c b/varnish-cache/bin/varnishtest/vtc_http.c
index 75c3d3e99deb3dd4d696dfa3757322913fd13cac..6cbe464605fd64768cd79ccc95dbf99be2d31a0e 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_http.c
+++ b/varnish-cache/bin/varnishtest/vtc_http.c
@@ -306,7 +306,7 @@ cmd_http_txresp(char **av, void *priv)
        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 @@ cmd_http_txreq(char **av, void *priv)
        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")) {

diff --git a/varnish-cache/bin/varnishtest/vtc_varnish.c b/varnish-cache/bin/varnishtest/vtc_varnish.c
index 3977f15ac5df4647b221695a33439e0383731100..f928c5c4d7d32b8011ff7a40a2df5e5e250f6878 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_varnish.c
+++ b/varnish-cache/bin/varnishtest/vtc_varnish.c
@@ -160,7 +160,7 @@ varnish_launch(struct varnish *v)
        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);

diff --git a/varnish-cache/lib/libvcl/vcc_compile.c b/varnish-cache/lib/libvcl/vcc_compile.c
index e4f8dbd62c0661f680f89909ad5305856f290aee..d55eae7f957a14ee30da0af72aed99d25b7733bd 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_compile.c
+++ b/varnish-cache/lib/libvcl/vcc_compile.c
@@ -490,24 +490,24 @@ vcc_NewTokenList(void)
        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);