[master] c36ef1c Use VSB_destroy() instead of VSB_delete() wherever possible.
Poul-Henning Kamp
phk at FreeBSD.org
Fri Feb 26 09:32:11 CET 2016
commit c36ef1c08fdc94010aed1c03d967769b8c51c4be
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri Feb 26 08:31:51 2016 +0000
Use VSB_destroy() instead of VSB_delete() wherever possible.
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index ad96330..21f0782 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -98,7 +98,7 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
b->display_name = strdup(VSB_data(vsb));
AN(b->display_name);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
b->vcl = vcl;
@@ -316,7 +316,7 @@ backend_find(struct cli *cli, const char *matcher, bf_func *func, void *priv)
}
}
Lck_Unlock(&backends_mtx);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
VCL_Rel(&vcc);
return (found);
}
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index e0590d8..5693408 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -472,7 +472,7 @@ vbp_build_req(struct vbp_target *vt, const struct vrt_backend_probe *vbp,
vt->req = strdup(VSB_data(vsb));
AN(vt->req);
vt->req_len = VSB_len(vsb);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_ban_build.c b/bin/varnishd/cache/cache_ban_build.c
index 4dec68b..55c78ae 100644
--- a/bin/varnishd/cache/cache_ban_build.c
+++ b/bin/varnishd/cache/cache_ban_build.c
@@ -91,7 +91,7 @@ BAN_Abandon(struct ban_proto *bp)
{
CHECK_OBJ_NOTNULL(bp, BAN_PROTO_MAGIC);
- VSB_delete(bp->vsb);
+ VSB_destroy(&bp->vsb);
FREE_OBJ(bp);
}
diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index 5060f9f..4f2af67 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -71,7 +71,7 @@ VDP_push(struct req *req, vdp_bytes *func, void *priv, int bottom)
Symbol_Lookup(vsb, func);
AZ(VSB_finish(vsb));
VSLb(req->vsl, SLT_Debug, "VDP %s %p %d", VSB_data(vsb), priv, bottom);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
#endif
vdp = WS_Alloc(req->ws, sizeof *vdp);
if (vdp == NULL)
diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index e1b9a56..734ac2a 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -130,7 +130,7 @@ vfp_esi_end(struct vfp_ctx *vc, struct vef_priv *vef,
"Could not allocate storage for esidata");
}
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
if (vef->vgz != NULL) {
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index e4de056..aa62545 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -446,8 +446,8 @@ vep_do_include(struct vep_state *vep, enum dowhat what)
"ESI 1.0 <esi:include> "
"has multiple src= attributes");
vep->state = VEP_TAGERROR;
- VSB_delete(vep->attr_vsb);
- VSB_delete(vep->include_src);
+ VSB_destroy(&vep->attr_vsb);
+ VSB_destroy(&vep->include_src);
vep->attr_vsb = NULL;
vep->include_src = NULL;
return;
@@ -539,7 +539,7 @@ vep_do_include(struct vep_state *vep, enum dowhat what)
#undef R
VSB_printf(vep->vsb, "%c", 0);
- VSB_delete(vep->include_src);
+ VSB_destroy(&vep->include_src);
vep->include_src = NULL;
}
@@ -887,7 +887,7 @@ VEP_Parse(struct vep_state *vep, const char *p, size_t l)
vep->attr_delim = 0;
if (vep->attr_vsb != NULL) {
AZ(VSB_finish(vep->attr_vsb));
- VSB_delete(vep->attr_vsb);
+ VSB_destroy(&vep->attr_vsb);
vep->attr_vsb = NULL;
}
} else if (p < e) {
@@ -1061,7 +1061,7 @@ VEP_Finish(struct vep_state *vep)
l = VSB_len(vep->vsb);
if (vep->esi_found && l > 0)
return (vep->vsb);
- VSB_delete(vep->vsb);
+ VSB_destroy(&vep->vsb);
return (NULL);
}
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 609e6c2..6067324 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -131,7 +131,7 @@ vbf_beresp2obj(struct busyobj *bo)
if (vary != NULL) {
AN(ObjSetAttr(bo->wrk, bo->fetch_objcore, OA_VARY, varyl,
VSB_data(vary)));
- VSB_delete(vary);
+ VSB_destroy(&vary);
}
AZ(ObjSetU32(bo->wrk, bo->fetch_objcore, OA_VXID, VXID(bo->vsl->wid)));
@@ -852,12 +852,12 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
AZ(VSB_finish(synth_body));
if (wrk->handling == VCL_RET_ABANDON) {
- VSB_delete(synth_body);
+ VSB_destroy(&synth_body);
return (F_STP_FAIL);
}
if (wrk->handling == VCL_RET_RETRY) {
- VSB_delete(synth_body);
+ VSB_destroy(&synth_body);
if (bo->retries++ < cache_param->max_retries)
return (F_STP_RETRY);
VSLb(bo->vsl, SLT_VCL_Error, "Too many retries, failing");
@@ -873,7 +873,7 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
bo->vfc->esi_req = bo->bereq;
if (vbf_beresp2obj(bo)) {
- VSB_delete(synth_body);
+ VSB_destroy(&synth_body);
return (F_STP_FAIL);
}
@@ -889,7 +889,7 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
o += l;
}
AZ(ObjSetU64(wrk, bo->fetch_objcore, OA_LEN, o));
- VSB_delete(synth_body);
+ VSB_destroy(&synth_body);
HSH_Unbusy(wrk, bo->fetch_objcore);
ObjSetState(wrk, bo->fetch_objcore, BOS_FINISHED);
return (F_STP_DONE);
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 991883f..94f893b 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -185,7 +185,7 @@ cnt_synth(struct worker *wrk, struct req *req)
if (wrk->handling == VCL_RET_RESTART) {
HTTP_Setup(h, req->ws, req->vsl, SLT_RespMethod);
- VSB_delete(synth_body);
+ VSB_destroy(&synth_body);
req->req_step = R_STP_RESTART;
return (REQ_FSM_MORE);
}
@@ -210,7 +210,7 @@ cnt_synth(struct worker *wrk, struct req *req)
if (szl >= 0)
AZ(ObjSetU64(wrk, req->objcore, OA_LEN, szl));
HSH_DerefBoc(wrk, req->objcore);
- VSB_delete(synth_body);
+ VSB_destroy(&synth_body);
if (szl < 0) {
VSLb(req->vsl, SLT_Error, "Could not get storage");
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index a7bd7a3..b983b54 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -158,15 +158,15 @@ VRY_Create(struct busyobj *bo, struct vsb **psb)
}
if (error) {
- VSB_delete(sbh);
- VSB_delete(sb);
+ VSB_destroy(&sbh);
+ VSB_destroy(&sb);
return (-1);
}
/* Terminate vary matching string */
VSB_printf(sb, "%c%c%c", 0xff, 0xff, 0);
- VSB_delete(sbh);
+ VSB_destroy(&sbh);
AZ(VSB_finish(sb));
*psb = sb;
return (VSB_len(sb));
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index e167db3..bfcba8b 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -339,7 +339,7 @@ VCL_TestLoad(const char *fn)
retval = -1;
} else
VCL_Close(&vcl);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
return (retval);
}
@@ -600,7 +600,7 @@ VCL_Load(struct cli *cli, const char *name, const char *fn, const char *state)
AZ(VSB_finish(vsb));
VCLI_SetResult(cli, CLIS_PARAM);
VCLI_Out(cli, "%s", VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
return;
}
@@ -630,7 +630,7 @@ VCL_Load(struct cli *cli, const char *name, const char *fn, const char *state)
vcl_cancel_load(&ctx, cli, name, "warmup");
return;
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
bprintf(vcl->state, "%s", state + 1);
assert(hand == VCL_RET_OK);
VCLI_Out(cli, "Loaded \"%s\" as \"%s\"", fn , name);
@@ -747,7 +747,7 @@ ccf_config_state(struct cli *cli, const char * const *av, void *priv)
AN(ctx.vcl); // MGT ensures this
if (vcl_set_state(&ctx, av[3]) == 0) {
bprintf(ctx.vcl->state, "%s", av[3] + 1);
- VSB_delete(ctx.msg);
+ VSB_destroy(&ctx.msg);
return;
}
AZ(VSB_finish(ctx.msg));
@@ -756,7 +756,7 @@ ccf_config_state(struct cli *cli, const char * const *av, void *priv)
av[3] + 1);
if (VSB_len(ctx.msg))
VCLI_Out(cli, "\nMessage:\n\t%s", VSB_data(ctx.msg));
- VSB_delete(ctx.msg);
+ VSB_destroy(&ctx.msg);
}
static void __match_proto__(cli_func_t)
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index e484252..55c3303 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -111,7 +111,7 @@ mgt_panic_record(pid_t r)
char time_str[30];
if (child_panic != NULL)
- VSB_delete(child_panic);
+ VSB_destroy(&child_panic);
child_panic = VSB_new_auto();
AN(child_panic);
VTIM_format(VTIM_real(), time_str);
@@ -127,7 +127,7 @@ mgt_panic_record(pid_t r)
static void
mgt_panic_clear(void)
{
- VSB_delete(child_panic);
+ VSB_destroy(&child_panic);
child_panic = NULL;
}
@@ -534,7 +534,7 @@ mgt_reap_child(void)
#endif
AZ(VSB_finish(vsb));
MGT_complain(status ? C_ERR : C_INFO, "%s", VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
/* Dispose of shared memory but evacuate panic messages first */
if (heritage.panic_str[0] != '\0') {
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 6df8f9e..06e1989 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -163,13 +163,13 @@ mcf_askchild(struct cli *cli, const char * const *av, void *priv)
AZ(VSB_finish(vsb));
i = write(cli_o, VSB_data(vsb), VSB_len(vsb));
if (i != VSB_len(vsb)) {
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
VCLI_SetResult(cli, CLIS_COMMS);
VCLI_Out(cli, "CLI communication error");
MGT_Child_Cli_Fail();
return;
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
if (VCLI_ReadResult(cli_i, &u, &q, mgt_param.cli_timeout))
MGT_Child_Cli_Fail();
VCLI_SetResult(cli, u);
@@ -485,7 +485,7 @@ telnet_accept(const struct vev *ev, int what)
tn = telnet_new(i);
vsb = sock_id("telnet", i);
mgt_cli_setup(i, i, 0, VSB_data(vsb), telnet_close, tn);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
return (0);
}
@@ -567,7 +567,7 @@ mgt_cli_telnet(const char *T_arg)
ARGV_ERR("-T %s could not be listened on.", T_arg);
/* Save in shmem */
mgt_SHM_static_alloc(VSB_data(vsb), VSB_len(vsb) + 1, "Arg", "-T", "");
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/* Reverse CLI ("Master") connections --------------------------------*/
@@ -617,7 +617,7 @@ Marg_connect(const struct vev *e, int what)
}
vsb = sock_id("master", M_fd);
mgt_cli_setup(M_fd, M_fd, 0, VSB_data(vsb), Marg_closer, NULL);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
M_poll = 1;
return (1);
}
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index ec4ff5a..2dc452a 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -170,7 +170,7 @@ MGT_complain(const char *loud, const char *fmt, ...)
if (!MGT_DO_DEBUG(DBG_VTC_MODE))
syslog(sf, "%s", VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 0ee9397..71f9751 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -307,7 +307,7 @@ mcf_param_show(struct cli *cli, const char * const *av, void *priv)
VCLI_SetResult(cli, CLIS_PARAM);
VCLI_Out(cli, "Unknown parameter \"%s\".", av[2]);
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/*--------------------------------------------------------------------
@@ -466,7 +466,7 @@ MCF_InitParams(struct cli *cli)
AN(pp->def);
mcf_wash_param(cli, pp, &pp->def, "default", vsb);
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index ac2c5f6..3810c74 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -104,7 +104,7 @@ run_vcc(void *priv)
AZ(VSB_finish(sb));
if (VSB_len(sb))
printf("%s", VSB_data(sb));
- VSB_delete(sb);
+ VSB_destroy(&sb);
if (csrc == NULL)
exit(2);
@@ -173,7 +173,7 @@ run_cc(void *priv)
(void)umask(027);
(void)execl("/bin/sh", "/bin/sh", "-c", VSB_data(sb), (char*)0);
- VSB_delete(sb); // For flexelint
+ VSB_destroy(&sb); // For flexelint
}
/*--------------------------------------------------------------------
@@ -291,7 +291,7 @@ mgt_VccCompile(struct cli *cli, const char *vclname, const char *vclsrc,
AZ(VSB_finish(sb));
if (VSB_len(sb) > 0)
VCLI_Out(cli, "%s", VSB_data(sb));
- VSB_delete(sb);
+ VSB_destroy(&sb);
(void)unlink(vp.csrcfile);
free(vp.csrcfile);
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 249efee..cd42e48 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -681,7 +681,7 @@ parse_format(const char *format)
VSB_clear(vsb);
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
static int
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 8890a62..5e6770a 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -234,7 +234,7 @@ macro_expand(struct vtclog *vl, const char *text)
p += 2;
m = macro_get(p, q);
if (m == NULL) {
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
vtc_log(vl, 0, "Macro ${%.*s} not found", (int)(q - p),
p);
NEEDLESS_RETURN (NULL);
@@ -480,7 +480,7 @@ cmd_err_shell(CMD_ARGS)
else
vtc_log(vl, 4,
"Found expected string: (\"%s\")", av[1]);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/**********************************************************************
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index 804ef6d..74bc8e7 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -106,7 +106,7 @@ client_thread(void *priv)
VTCP_close(&fd);
}
vtc_log(vl, 2, "Ending");
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
free(p);
return (NULL);
}
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 9160a66..7a7cd24 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -1399,7 +1399,7 @@ http_process(struct vtclog *vl, const char *spec, int sock, int *sfd)
VTCP_hisname(sock, hp->rem_ip, VTCP_ADDRBUFSIZE, hp->rem_port, VTCP_PORTBUFSIZE);
parse_string(spec, http_cmds, hp, vl);
retval = hp->fd;
- VSB_delete(hp->vsb);
+ VSB_destroy(&hp->vsb);
free(hp->rxbuf);
free(hp->rem_ip);
free(hp->rem_port);
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 9b1ddf0..67918c3 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -77,7 +77,7 @@ vtc_logclose(struct vtclog *vl)
CHECK_OBJ_NOTNULL(vl, VTCLOG_MAGIC);
if (pthread_getspecific(log_key) == vl)
AZ(pthread_setspecific(log_key, NULL));
- VSB_delete(vl->vsb);
+ VSB_destroy(&vl->vsb);
AZ(pthread_mutex_destroy(&vl->mtx));
FREE_OBJ(vl);
}
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 1c0ea70..c82b8e4 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -122,7 +122,7 @@ logexp_delete_tests(struct logexp *le)
while ((test = VTAILQ_FIRST(&le->tests))) {
CHECK_OBJ_NOTNULL(test, LOGEXP_TEST_MAGIC);
VTAILQ_REMOVE(&le->tests, test, list);
- VSB_delete(test->str);
+ VSB_destroy(&test->str);
if (test->vre)
VRE_free(&test->vre);
FREE_OBJ(test);
@@ -142,7 +142,7 @@ logexp_delete(struct logexp *le)
free(le->query);
VSM_Delete(le->vsm);
if (le->n_arg)
- VSB_delete(le->n_arg);
+ VSB_destroy(&le->n_arg);
FREE_OBJ(le);
}
@@ -529,7 +529,7 @@ cmd_logexp(CMD_ARGS)
return;
}
if (le->n_arg != NULL) {
- VSB_delete(le->n_arg);
+ VSB_destroy(&le->n_arg);
le->n_arg = NULL;
}
vsb = VSB_new_auto();
@@ -537,7 +537,7 @@ cmd_logexp(CMD_ARGS)
AZ(VSB_printf(vsb, "%s/%s", tmpdir, av[1]));
AZ(VSB_finish(vsb));
le->n_arg = macro_expand(le->vl, VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
if (le->n_arg == NULL)
return;
av++;
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index cd3fb1d..56efdb9 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -395,7 +395,7 @@ i_mode(void)
vmod_path = strdup(VSB_data(vsb));
AN(vmod_path);
free(topbuild);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/**********************************************************************
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index f63c2e5..c87f7dc 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -78,7 +78,7 @@ static VTAILQ_HEAD(, process) processes =
AN(vsb); \
p->field = strdup(VSB_data(vsb)); \
AN(p->field); \
- VSB_delete(vsb); \
+ VSB_destroy(&vsb); \
} while (0)
static struct process *
@@ -214,7 +214,7 @@ process_start(struct process *p)
AZ(close(out_fd));
AZ(close(err_fd));
p->fds[0] = -1;
- VSB_delete(cl);
+ VSB_destroy(&cl);
AZ(pthread_create(&p->tp, NULL, process_thread, p));
}
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 0afe475..794f615 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -296,7 +296,7 @@ varnish_new(const char *name)
AN(vsb);
v->workdir = strdup(VSB_data(vsb));
AN(v->workdir);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
bprintf(buf, "rm -rf %s ; mkdir -p %s", v->workdir, v->workdir);
AZ(system(buf));
@@ -429,7 +429,7 @@ varnish_launch(struct varnish *v)
vtc_log(v->vl, 3, "CMD: %s", VSB_data(vsb));
vsb1 = macro_expand(v->vl, VSB_data(vsb));
AN(vsb1);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
vsb = vsb1;
vtc_log(v->vl, 3, "CMD: %s", VSB_data(vsb));
AZ(pipe(&v->fds[0]));
@@ -456,7 +456,7 @@ varnish_launch(struct varnish *v)
AZ(close(v->fds[3]));
v->fds[0] = v->fds[2];
v->fds[2] = v->fds[3] = -1;
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
AZ(pthread_create(&v->tp, NULL, varnish_thread, v));
AZ(pthread_create(&v->tp_vsl, NULL, varnishlog_thread, v));
@@ -712,7 +712,7 @@ varnish_vcl(struct varnish *v, const char *vcl, enum VCLI_status_e expect,
u = varnish_ask_cli(v, VSB_data(vsb), resp);
if (u != expect) {
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
vtc_log(v->vl, 0,
"VCL compilation got %u expected %u",
u, expect);
@@ -727,7 +727,7 @@ varnish_vcl(struct varnish *v, const char *vcl, enum VCLI_status_e expect,
} else {
vtc_log(v->vl, 2, "VCL compilation failed (as expected)");
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
}
/**********************************************************************
@@ -762,8 +762,8 @@ varnish_vclbackend(struct varnish *v, const char *vcl)
u = varnish_ask_cli(v, VSB_data(vsb), NULL);
if (u != CLIS_OK) {
- VSB_delete(vsb);
- VSB_delete(vsb2);
+ VSB_destroy(&vsb);
+ VSB_destroy(&vsb2);
vtc_log(v->vl, 0, "FAIL VCL does not compile");
return;
}
@@ -772,8 +772,8 @@ varnish_vclbackend(struct varnish *v, const char *vcl)
AZ(VSB_finish(vsb));
u = varnish_ask_cli(v, VSB_data(vsb), NULL);
assert(u == CLIS_OK);
- VSB_delete(vsb);
- VSB_delete(vsb2);
+ VSB_destroy(&vsb);
+ VSB_destroy(&vsb2);
}
/**********************************************************************
diff --git a/lib/libvarnish/cli_serve.c b/lib/libvarnish/cli_serve.c
index 9861e0c..87e8b54 100644
--- a/lib/libvarnish/cli_serve.c
+++ b/lib/libvarnish/cli_serve.c
@@ -452,7 +452,7 @@ cls_vlu(void *priv, const char *p)
cfd->argv = NULL;
free(cli->cmd);
cli->cmd = NULL;
- VSB_delete(cfd->last_arg);
+ VSB_destroy(&cfd->last_arg);
cfd->last_arg = NULL;
cfd->last_idx = 0;
return (i);
@@ -512,7 +512,7 @@ cls_close_fd(struct VCLS *cs, struct VCLS_fd *cfd)
VTAILQ_REMOVE(&cs->fds, cfd, list);
cs->nfd--;
VLU_Destroy(cfd->cli->vlu);
- VSB_delete(cfd->cli->sb);
+ VSB_destroy(&cfd->cli->sb);
if (cfd->closefunc == NULL) {
(void)close(cfd->fdi);
if (cfd->fdo != cfd->fdi)
diff --git a/lib/libvarnish/vfil.c b/lib/libvarnish/vfil.c
index 319c3e1..9c7af4d 100644
--- a/lib/libvarnish/vfil.c
+++ b/lib/libvarnish/vfil.c
@@ -330,11 +330,11 @@ VFIL_searchpath(const struct vfil_path *vp, vfil_path_func_f *func, void *priv,
e = errno;
*fno = strdup(VSB_data(vsb));
AN(*fno);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
errno = e;
return (i);
}
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
return (-1);
}
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 0197e11..24feeee 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -160,7 +160,7 @@ VSL_ResetError(struct VSL_data *vsl)
if (vsl->diag == NULL)
return;
- VSB_delete(vsl->diag);
+ VSB_destroy(&vsl->diag);
vsl->diag = NULL;
}
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 0159429..b2e0860 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -323,7 +323,7 @@ vslq_newquery(struct VSL_data *vsl, enum VSL_grouping_e grouping,
XXXAN(query);
query->vex = vex;
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
return (query);
}
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 8e1aa7f..92b636e 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -123,7 +123,7 @@ VSM_ResetError(struct VSM_data *vd)
if (vd->diag == NULL)
return;
- VSB_delete(vd->diag);
+ VSB_destroy(&vd->diag);
vd->diag = NULL;
}
diff --git a/lib/libvarnishapi/vxp_test.c b/lib/libvarnishapi/vxp_test.c
index 55e5820..cbb598a 100644
--- a/lib/libvarnishapi/vxp_test.c
+++ b/lib/libvarnishapi/vxp_test.c
@@ -72,11 +72,11 @@ main(int argc, char * const *argv)
if (vex == NULL) {
VSB_finish(vsb);
fprintf(stderr, "Error:\n%s", VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
free(q_arg);
exit(1);
}
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
vex_Free(&vex);
AZ(vex);
diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c
index 3260f65..d544ffd 100644
--- a/lib/libvcc/vcc_backend.c
+++ b/lib/libvcc/vcc_backend.c
@@ -123,7 +123,7 @@ vcc_ParseProbeSpec(struct vcc *tl, const struct token *nm, char **name)
VSB_printf(vsb, "vgc_probe__%d", tl->nprobe++);
AZ(VSB_finish(vsb));
retval = TlDup(tl, VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
if (name != NULL)
*name = retval;
@@ -436,7 +436,7 @@ vcc_ParseHostDef(struct vcc *tl, const struct token *t_be, const char *vgcname)
tl->fb = NULL;
AZ(VSB_finish(vsb));
Fh(tl, 0, "%s", VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
ifp = New_IniFin(tl);
VSB_printf(ifp->ini,
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index 0f94b21..2161cb7 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -351,7 +351,7 @@ EmitInitFini(const struct vcc *tl)
if (VSB_len(p->ini))
Fc(tl, 0, "\t/* %u */\n%s\n", p->n, VSB_data(p->ini));
Fc(tl, 0, "\tvgc_inistep = %u;\n\n", p->n);
- VSB_delete(p->ini);
+ VSB_destroy(&p->ini);
AZ(VSB_finish(p->event));
if (VSB_len(p->event))
@@ -376,7 +376,7 @@ EmitInitFini(const struct vcc *tl)
Fc(tl, 0, "%s\n", VSB_data(p->fin));
Fc(tl, 0, "\t}\n\n");
}
- VSB_delete(p->fin);
+ VSB_destroy(&p->fin);
}
Fc(tl, 0, "\treturn(0);\n");
@@ -435,7 +435,7 @@ EmitInitFini(const struct vcc *tl)
Fc(tl, 0, "\t %s != 0)\n", VSB_data(p->event));
Fc(tl, 0, "\t\tretval = 1;\n\n");
}
- VSB_delete(p->event);
+ VSB_destroy(&p->event);
}
Fc(tl, 0, "\treturn (retval);\n");
@@ -596,7 +596,7 @@ vcc_resolve_includes(struct vcc *tl)
VSB_cat(vsb, t1->dec + 1);
AZ(VSB_finish(vsb));
sp = vcc_file_source(tl->param, tl->sb, VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
} else {
sp = vcc_file_source(tl->param, tl->sb, t1->dec);
}
@@ -683,10 +683,10 @@ vcc_DestroyTokenList(struct vcc *tl, char *ret)
FREE_OBJ(sym);
}
- VSB_delete(tl->fh);
- VSB_delete(tl->fc);
+ VSB_destroy(&tl->fh);
+ VSB_destroy(&tl->fc);
for (i = 0; i < VCL_MET_MAX; i++)
- VSB_delete(tl->fm[i]);
+ VSB_destroy(&tl->fm[i]);
free(tl);
return (ret);
@@ -839,7 +839,7 @@ vcc_CompileSource(const struct vcp * const vcp, struct vsb *sb,
of = strdup(VSB_data(vsb));
AN(of);
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
/* done */
return (vcc_DestroyTokenList(tl, of));
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 574ca53..b84d67f 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -271,7 +271,7 @@ vcc_delete_expr(struct expr *e)
if (e == NULL)
return;
CHECK_OBJ_NOTNULL(e, EXPR_MAGIC);
- VSB_delete(e->vsb);
+ VSB_destroy(&e->vsb);
FREE_OBJ(e);
}
/*--------------------------------------------------------------------
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index 40f0f86..a95c20c 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -219,7 +219,7 @@ Resolve_Sockaddr(struct vcc *tl,
vcc_ErrWhere(tl, t_err);
free(rss->vsa4);
free(rss->vsa6);
- VSB_delete(rss->vsb);
+ VSB_destroy(&rss->vsb);
FREE_OBJ(rss);
return;
}
@@ -250,6 +250,6 @@ Resolve_Sockaddr(struct vcc *tl,
VSB_data(rss->vsb));
vcc_ErrWhere(tl, t_err);
}
- VSB_delete(rss->vsb);
+ VSB_destroy(&rss->vsb);
FREE_OBJ(rss);
}
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index a018f36..4b03269 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -79,7 +79,7 @@ vcc_Var_Wildcard(struct vcc *tl, const struct token *t, const struct symbol *wc)
VSB_printf(vsb, "VRT_SetHdr(ctx, %s,", v->rname);
AZ(VSB_finish(vsb));
v->lname = TlDup(tl, VSB_data(vsb));
- VSB_delete(vsb);
+ VSB_destroy(&vsb);
sym = VCC_AddSymbolTok(tl, t, SYM_VAR);
AN(sym);
More information about the varnish-commit
mailing list