Commit bc49d2ed authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Use vsb_newauto() macro throughout



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@2716 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 5cc1ff05
......@@ -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);
......
......@@ -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++) {
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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 &&
......
......@@ -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
......
......@@ -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")) {
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment