[master] f78a90b Various nitpicking

Poul-Henning Kamp phk at FreeBSD.org
Mon Nov 6 07:49:05 UTC 2017


commit f78a90b824e1f540750f6e60d86b301d0a69aab2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 6 07:47:55 2017 +0000

    Various nitpicking

diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index 3145c58..1f80adc 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -174,6 +174,7 @@ process_thread(void *priv)
 	CAST_OBJ_NOTNULL(p, priv, PROCESS_MAGIC);
 	if (p->fd_from > 0) {
 		vlu = VLU_New(p, process_vlu_func, 1024);
+		AN(vlu);
 		while (!VLU_Fd(p->fd_from, vlu))
 			continue;
 		VLU_Destroy(vlu);
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index cb40ea9..2196388 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -432,12 +432,13 @@ VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 	cfd->cli = &cfd->clis;
 	cfd->cli->magic = CLI_MAGIC;
 	cfd->cli->vlu = VLU_New(cfd, cls_vlu, *cs->maxlen);
+	AN(cfd->cli->vlu);
 	cfd->cli->sb = VSB_new_auto();
+	AN(cfd->cli->sb);
 	cfd->cli->limit = cs->limit;
 	cfd->cli->priv = priv;
 	cfd->closefunc = closefunc;
 	cfd->priv = priv;
-	AN(cfd->cli->sb);
 	VTAILQ_INSERT_TAIL(&cs->fds, cfd, list);
 	cs->nfd++;
 	return (cfd->cli);
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index e3f7453..9881b0d 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -127,6 +127,7 @@ VSUB_run(struct vsb *sb, vsub_func_f *func, void *priv, const char *name,
 	}
 	closefd(&p[1]);
 	vlu = VLU_New(&sp, vsub_vlu, 0);
+	AN(vlu);
 	while (!VLU_Fd(p[0], vlu))
 		continue;
 	closefd(&p[0]);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 17636da..bbe3a16 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -712,9 +712,7 @@ vcc_Eval_Func(struct vcc *tl, const char *spec,
     const char *extra, const struct symbol *sym)
 {
 	struct expr *e = NULL;
-	struct token *t1;
 
-	t1 = tl->t;
 	vcc_func(tl, &e, spec, extra, sym);
 	ERRCHK(tl);
 	vcc_expr_fmt(tl->fb, tl->indent, e);


More information about the varnish-commit mailing list