[master] 8631295 More mechanical changes to track FreeBSD's sbufs closer

Poul-Henning Kamp phk at varnish-cache.org
Mon Apr 4 14:59:17 CEST 2011


commit 86312952c5036efdf731f0004bbb969fba93e833
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 4 12:58:57 2011 +0000

    More mechanical changes to track FreeBSD's sbufs closer

diff --git a/bin/varnishd/cache_backend_poll.c b/bin/varnishd/cache_backend_poll.c
index 50b4b41..9cf241c 100644
--- a/bin/varnishd/cache_backend_poll.c
+++ b/bin/varnishd/cache_backend_poll.c
@@ -323,7 +323,7 @@ vbp_build_req(struct vsb *vsb, const struct vbp_vcl *vcl)
 		vsb_printf(vsb, "\r\n");
 	}
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 }
 
 /*--------------------------------------------------------------------
@@ -488,7 +488,7 @@ VBP_Start(struct backend *b, const struct vrt_backend_probe *p, const char *host
 		XXXAN(vt);
 		VTAILQ_INIT(&vt->vcls);
 		vt->backend = b;
-		vt->vsb = vsb_newauto();
+		vt->vsb = vsb_new_auto();
 		XXXAN(vt->vsb);
 		b->probe = vt;
 		startthread = 1;
diff --git a/bin/varnishd/cache_ban.c b/bin/varnishd/cache_ban.c
index f156018..c21db4f 100644
--- a/bin/varnishd/cache_ban.c
+++ b/bin/varnishd/cache_ban.c
@@ -75,7 +75,7 @@ BAN_New(void)
 	ALLOC_OBJ(b, BAN_MAGIC);
 	if (b == NULL)
 		return (b);
-	b->vsb = vsb_newauto();
+	b->vsb = vsb_new_auto();
 	if (b->vsb == NULL) {
 		FREE_OBJ(b);
 		return (NULL);
@@ -314,7 +314,7 @@ BAN_Insert(struct ban *b)
 	b->t0 = TIM_real();
 
 	vsb_finish(b->vsb);
-	AZ(vsb_overflowed(b->vsb));
+	AZ(vsb_error(b->vsb));
 	b->test = strdup(vsb_data(b->vsb));
 	AN(b->test);
 	vsb_delete(b->vsb);
diff --git a/bin/varnishd/cache_esi_parse.c b/bin/varnishd/cache_esi_parse.c
index dcf6ba7..ad18a86 100644
--- a/bin/varnishd/cache_esi_parse.c
+++ b/bin/varnishd/cache_esi_parse.c
@@ -846,7 +846,7 @@ VEP_parse(const struct sess *sp, const char *p, size_t l)
 				vep->state = VEP_TAGERROR;
 			}
 		} else if (vep->state == VEP_ATTRGETVAL) {
-			vep->attr_vsb = vsb_newauto();
+			vep->attr_vsb = vsb_new_auto();
 			vep->state = VEP_ATTRDELIM;
 		} else if (vep->state == VEP_ATTRDELIM) {
 			AZ(vep->attr_delim);
@@ -1005,7 +1005,7 @@ VEP_Init(const struct sess *sp, vep_callback_t *cb)
 	memset(vep, 0, sizeof *vep);
 	vep->magic = VEP_MAGIC;
 	vep->sp = sp;
-	vep->vsb = vsb_newauto();
+	vep->vsb = vsb_new_auto();
 	AN(vep->vsb);
 
 	if (cb != NULL) {
diff --git a/bin/varnishd/cache_vary.c b/bin/varnishd/cache_vary.c
index 9149df0..f079156 100644
--- a/bin/varnishd/cache_vary.c
+++ b/bin/varnishd/cache_vary.c
@@ -75,11 +75,11 @@ VRY_Create(const struct sess *sp, const struct http *hp)
 		return (NULL);
 
 	/* For vary matching string */
-	sb = vsb_newauto();
+	sb = vsb_new_auto();
 	AN(sb);
 
 	/* For header matching strings */
-	sbh = vsb_newauto();
+	sbh = vsb_new_auto();
 	AN(sbh);
 
 	if (*v == ':') {
@@ -98,7 +98,7 @@ VRY_Create(const struct sess *sp, const struct http *hp)
 		vsb_clear(sbh);
 		vsb_printf(sbh, "%c%.*s:%c", 1 + (q - p), q - p, p, 0);
 		vsb_finish(sbh);
-		AZ(vsb_overflowed(sbh));
+		AZ(vsb_error(sbh));
 
 		/* Append to vary matching string */
 		vsb_bcat(sb, vsb_data(sbh), vsb_len(sbh));
@@ -132,7 +132,7 @@ VRY_Create(const struct sess *sp, const struct http *hp)
 
 	vsb_delete(sbh);
 	vsb_finish(sb);
-	AZ(vsb_overflowed(sb));
+	AZ(vsb_error(sb));
 	return(sb);
 }
 
diff --git a/bin/varnishd/mgt_child.c b/bin/varnishd/mgt_child.c
index a670a36..a11da9e 100644
--- a/bin/varnishd/mgt_child.c
+++ b/bin/varnishd/mgt_child.c
@@ -444,13 +444,13 @@ mgt_save_panic(void)
 
 	if (child_panic)
 		vsb_delete(child_panic);
-	child_panic = vsb_newauto();
+	child_panic = vsb_new_auto();
 	XXXAN(child_panic);
 	TIM_format(TIM_real(), time_str);
 	vsb_printf(child_panic, "Last panic at: %s\n", time_str);
 	vsb_cat(child_panic, vsm_head->panicstr);
 	vsb_finish(child_panic);
-	AZ(vsb_overflowed(child_panic));
+	AZ(vsb_error(child_panic));
 }
 
 static void
@@ -482,7 +482,7 @@ mgt_sigchld(const struct vev *e, int what)
 	if (r == 0 || (r == -1 && errno == ECHILD))
 		return (0);
 	assert(r == child_pid);
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	XXXAN(vsb);
 	vsb_printf(vsb, "Child (%d) %s", r, status ? "died" : "ended");
 	if (!WIFEXITED(status) && WEXITSTATUS(status)) {
@@ -500,7 +500,7 @@ mgt_sigchld(const struct vev *e, int what)
 	}
 #endif
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 	REPORT(LOG_INFO, "%s", vsb_data(vsb));
 	vsb_delete(vsb);
 
diff --git a/bin/varnishd/mgt_cli.c b/bin/varnishd/mgt_cli.c
index 0b364fd..713d097 100644
--- a/bin/varnishd/mgt_cli.c
+++ b/bin/varnishd/mgt_cli.c
@@ -444,13 +444,13 @@ sock_id(const char *pfx, int fd)
 	char abuf1[TCP_ADDRBUFSIZE], abuf2[TCP_ADDRBUFSIZE];
 	char pbuf1[TCP_PORTBUFSIZE], pbuf2[TCP_PORTBUFSIZE];
 
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 	TCP_myname(fd, abuf1, sizeof abuf1, pbuf1, sizeof pbuf1);
 	TCP_hisname(fd, abuf2, sizeof abuf2, pbuf2, sizeof pbuf2);
 	vsb_printf(vsb, "%s %s %s %s %s", pfx, abuf2, pbuf2, abuf1, pbuf1);
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 	return (vsb);
 }
 
@@ -559,7 +559,7 @@ mgt_cli_telnet(const char *T_arg)
 		exit(2);
 	}
 	good = 0;
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	XXXAN(vsb);
 	for (i = 0; i < n; ++i) {
 		sock = VSS_listen(ta[i], 10);
@@ -584,7 +584,7 @@ mgt_cli_telnet(const char *T_arg)
 		exit(2);
 	}
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 	/* Save in shmem */
 	p = VSM_Alloc(vsb_len(vsb) + 1, "Arg", "-T", "");
 	AN(p);
diff --git a/bin/varnishd/mgt_vcc.c b/bin/varnishd/mgt_vcc.c
index 9c42393..3ba8af3 100644
--- a/bin/varnishd/mgt_vcc.c
+++ b/bin/varnishd/mgt_vcc.c
@@ -89,7 +89,7 @@ mgt_make_cc_cmd(const char *sf, const char *of)
 	int pct;
 	char *p;
 
-	sb = vsb_newauto();
+	sb = vsb_new_auto();
 	XXXAN(sb);
 	for (p = mgt_cc_cmd, pct = 0; *p; ++p) {
 		if (pct) {
@@ -118,7 +118,7 @@ mgt_make_cc_cmd(const char *sf, const char *of)
 	if (pct)
 		vsb_putc(sb, '%');
 	vsb_finish(sb);
-	AZ(vsb_overflowed(sb));
+	AZ(vsb_error(sb));
 	return (sb);
 }
 
@@ -142,14 +142,14 @@ run_vcc(void *priv)
 	int fd, i, l;
 
 	CAST_OBJ_NOTNULL(vp, priv, VCC_PRIV_MAGIC);
-	sb = vsb_newauto();
+	sb = vsb_new_auto();
 	XXXAN(sb);
 	VCC_VCL_dir(vcc, mgt_vcl_dir);
 	VCC_VMOD_dir(vcc, mgt_vmod_dir);
 	VCC_Err_Unref(vcc, mgt_vcc_err_unref);
 	csrc = VCC_Compile(vcc, sb, vp->vcl);
 	vsb_finish(sb);
-	AZ(vsb_overflowed(sb));
+	AZ(vsb_error(sb));
 	if (vsb_len(sb))
 		printf("%s", vsb_data(sb));
 	vsb_delete(sb);
@@ -299,11 +299,11 @@ mgt_VccCompile(struct vsb **sb, const char *b, int C_flag)
 {
 	char *vf;
 
-	*sb = vsb_newauto();
+	*sb = vsb_new_auto();
 	XXXAN(*sb);
 	vf = mgt_run_cc(b, *sb, C_flag);
 	vsb_finish(*sb);
-	AZ(vsb_overflowed(*sb));
+	AZ(vsb_error(*sb));
 	return (vf);
 }
 
diff --git a/bin/varnishd/storage_synth.c b/bin/varnishd/storage_synth.c
index 4ee4337..02f58e6 100644
--- a/bin/varnishd/storage_synth.c
+++ b/bin/varnishd/storage_synth.c
@@ -89,7 +89,7 @@ SMS_Makesynth(struct object *obj)
 
 	sto = calloc(sizeof *sto, 1);
 	XXXAN(sto);
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	XXXAN(vsb);
 	sto->priv = vsb;
 	sto->len = 0;
@@ -113,7 +113,7 @@ SMS_Finish(struct object *obj)
 	assert(sto->stevedore == &sms_stevedore);
 	vsb = sto->priv;
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 
 	sto->ptr = (void*)vsb_data(vsb);
 	sto->len = vsb_len(vsb);
diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index 68037ed..df64f18 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -90,7 +90,7 @@ build_vident(void)
 {
 	struct utsname uts;
 
-	vident = vsb_newauto();
+	vident = vsb_new_auto();
 	AN(vident);
 	if (!uname(&uts)) {
 		vsb_printf(vident, ",%s", uts.sysname);
@@ -230,7 +230,7 @@ cli_check(const struct cli *cli)
 		return;
 	}
 	vsb_finish(cli->sb);
-	AZ(vsb_overflowed(cli->sb));
+	AZ(vsb_error(cli->sb));
 	fprintf(stderr, "Error:\n%s\n", vsb_data(cli->sb));
 	exit (2);
 }
@@ -402,7 +402,7 @@ main(int argc, char * const *argv)
 	SHA256_Test();
 
 	memset(cli, 0, sizeof cli);
-	cli[0].sb = vsb_newauto();
+	cli[0].sb = vsb_new_auto();
 	XXXAN(cli[0].sb);
 	cli[0].result = CLIS_OK;
 
@@ -535,7 +535,7 @@ main(int argc, char * const *argv)
 	if (cli[0].result != CLIS_OK) {
 		fprintf(stderr, "Parameter errors:\n");
 		vsb_finish(cli[0].sb);
-		AZ(vsb_overflowed(cli[0].sb));
+		AZ(vsb_error(cli[0].sb));
 		fprintf(stderr, "%s\n", vsb_data(cli[0].sb));
 		exit(1);
 	}
@@ -623,7 +623,7 @@ main(int argc, char * const *argv)
 	mgt_SHM_Init(l_arg);
 
 	vsb_finish(vident);
-	AZ(vsb_overflowed(vident));
+	AZ(vsb_error(vident));
 
 	if (!d_flag && !F_flag)
 		AZ(varnish_daemon(1, 0));
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index 0d78bf2..9659046 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -127,7 +127,7 @@ h_order(void *priv, enum vsl_tag tag, unsigned fd, unsigned len,
 		return (0);
 	}
 	if (ob[fd] == NULL) {
-		ob[fd] = vsb_newauto();
+		ob[fd] = vsb_new_auto();
 		assert(ob[fd] != NULL);
 	}
 	if (tag == match_tag &&
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 1cc16cf..e374988 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -164,7 +164,7 @@ macro_expand(struct vtclog *vl, const char *text)
 	const char *p, *q;
 	char *m;
 
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 	while (*text != '\0') {
 		p = strstr(text, "${");
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 66c0308..95d41e8 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -142,7 +142,7 @@ http_write(const struct http *hp, int lvl, const char *pfx)
 	int l;
 
 	vsb_finish(hp->vsb);
-	AZ(vsb_overflowed(hp->vsb));
+	AZ(vsb_error(hp->vsb));
 	vtc_dump(hp->vl, lvl, pfx, vsb_data(hp->vsb), vsb_len(hp->vsb));
 	l = write(hp->fd, vsb_data(hp->vsb), vsb_len(hp->vsb));
 	if (l != vsb_len(hp->vsb))
@@ -1073,7 +1073,7 @@ http_process(struct vtclog *vl, const char *spec, int sock, int sfd)
 	hp->fd = sock;
 	hp->timeout = 5000;
 	hp->nrxbuf = 640*1024;
-	hp->vsb = vsb_newauto();
+	hp->vsb = vsb_new_auto();
 	hp->rxbuf = malloc(hp->nrxbuf);		/* XXX */
 	hp->sfd = sfd;
 	hp->vl = vl;
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 08e683e..bee6fe2 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -82,7 +82,7 @@ vtc_logopen(const char *id)
 	ALLOC_OBJ(vl, VTCLOG_MAGIC);
 	AN(vl);
 	vl->id = id;
-	vl->vsb = vsb_newauto();
+	vl->vsb = vsb_new_auto();
 	AZ(pthread_mutex_init(&vl->mtx, NULL));
 	AZ(pthread_setspecific(log_key, vl));
 	return (vl);
@@ -141,7 +141,7 @@ vtc_log(struct vtclog *vl, unsigned lvl, const char *fmt, ...)
 	va_end(ap);
 	vsb_putc(vl->vsb, '\n');
 	vsb_finish(vl->vsb);
-	AZ(vsb_overflowed(vl->vsb));
+	AZ(vsb_error(vl->vsb));
 
 	vtc_log_emit(vl, lvl);
 
@@ -212,7 +212,7 @@ vtc_dump(struct vtclog *vl, unsigned lvl, const char *pfx, const char *str, int
 	if (!nl)
 		vsb_printf(vl->vsb, "\n");
 	vsb_finish(vl->vsb);
-	AZ(vsb_overflowed(vl->vsb));
+	AZ(vsb_error(vl->vsb));
 
 	vtc_log_emit(vl, lvl);
 
@@ -267,7 +267,7 @@ vtc_hexdump(struct vtclog *vl, unsigned lvl, const char *pfx, const unsigned cha
 	if (!nl)
 		vsb_printf(vl->vsb, "\n");
 	vsb_finish(vl->vsb);
-	AZ(vsb_overflowed(vl->vsb));
+	AZ(vsb_error(vl->vsb));
 
 	vtc_log_emit(vl, lvl);
 
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 30ab828..c4a9477 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -154,9 +154,9 @@ varnish_new(const char *name)
 	if (*v->name != 'v')
 		vtc_log(v->vl, 0, "Varnish name must start with 'v'");
 
-	v->args = vsb_newauto();
+	v->args = vsb_new_auto();
 
-	v->storage = vsb_newauto();
+	v->storage = vsb_new_auto();
 	vsb_printf(v->storage, "-sfile,%s,10M", v->workdir);
 	vsb_finish(v->storage);
 
@@ -251,9 +251,9 @@ varnish_launch(struct varnish *v)
 	TCP_myname(v->cli_fd, abuf, sizeof abuf, pbuf, sizeof pbuf);
 
 	vsb_finish(v->args);
-	AZ(vsb_overflowed(v->args));
+	AZ(vsb_error(v->args));
 	vtc_log(v->vl, 2, "Launch");
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 	vsb_printf(vsb, "cd ${topbuild}/bin/varnishd &&");
 	vsb_printf(vsb, " ./varnishd -d -d -n %s", v->workdir);
@@ -267,7 +267,7 @@ varnish_launch(struct varnish *v)
 	vsb_printf(vsb, " %s", vsb_data(v->storage));
 	vsb_printf(vsb, " %s", vsb_data(v->args));
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 	vtc_log(v->vl, 3, "CMD: %s", vsb_data(vsb));
 	vsb1 = macro_expand(v->vl, vsb_data(vsb));
 	AN(vsb1);
@@ -509,13 +509,13 @@ varnish_vcl(struct varnish *v, const char *vcl, enum cli_status_e expect)
 		varnish_launch(v);
 	if (vtc_error)
 		return;
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 
 	vsb_printf(vsb, "vcl.inline vcl%d << %s\n%s\n%s\n",
 	    ++v->vcl_nbr, NONSENSE, vcl, NONSENSE);
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 
 	u = varnish_ask_cli(v, vsb_data(vsb), NULL);
 	if (u != expect) {
@@ -529,7 +529,7 @@ varnish_vcl(struct varnish *v, const char *vcl, enum cli_status_e expect)
 		vsb_clear(vsb);
 		vsb_printf(vsb, "vcl.use vcl%d", v->vcl_nbr);
 		vsb_finish(vsb);
-		AZ(vsb_overflowed(vsb));
+		AZ(vsb_error(vsb));
 		u = varnish_ask_cli(v, vsb_data(vsb), NULL);
 		assert(u == CLIS_OK);
 	} else {
@@ -552,20 +552,20 @@ varnish_vclbackend(struct varnish *v, const char *vcl)
 		varnish_launch(v);
 	if (vtc_error)
 		return;
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 
-	vsb2 = vsb_newauto();
+	vsb2 = vsb_new_auto();
 	AN(vsb2);
 
 	cmd_server_genvcl(vsb2);
 	vsb_finish(vsb2);
-	AZ(vsb_overflowed(vsb2));
+	AZ(vsb_error(vsb2));
 
 	vsb_printf(vsb, "vcl.inline vcl%d << %s\n%s\n%s\n%s\n",
 	    ++v->vcl_nbr, NONSENSE, vsb_data(vsb2), vcl, NONSENSE);
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 
 	u = varnish_ask_cli(v, vsb_data(vsb), NULL);
 	if (u != CLIS_OK) {
@@ -577,7 +577,7 @@ varnish_vclbackend(struct varnish *v, const char *vcl)
 	vsb_clear(vsb);
 	vsb_printf(vsb, "vcl.use vcl%d", v->vcl_nbr);
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 	u = varnish_ask_cli(v, vsb_data(vsb), NULL);
 	assert(u == CLIS_OK);
 	vsb_delete(vsb);
diff --git a/include/vsb.h b/include/vsb.h
index 63fd984..db65eae 100644
--- a/include/vsb.h
+++ b/include/vsb.h
@@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Smørgrav
+ * Copyright (c) 2000-2008 Poul-Henning Kamp
+ * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,19 +13,19 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
- * $Id$
- * $FreeBSD: src/sys/sys/vsb.h,v 1.14 2004/07/09 11:35:30 des Exp $
+ *      $FreeBSD: head/sys/sys/sbuf.h 212425 2010-09-10 16:42:16Z mdf $
  */
 
 #ifndef VSB_H_INCLUDED
@@ -55,7 +56,8 @@ extern "C" {
  * API functions
  */
 struct vsb	*vsb_new(struct vsb *, char *, int, int);
-#define vsb_newauto()	vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND)
+#define		 vsb_new_auto()				\
+	vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND)
 void		 vsb_clear(struct vsb *);
 int		 vsb_setpos(struct vsb *, int);
 int		 vsb_bcat(struct vsb *, const void *, size_t);
@@ -63,15 +65,15 @@ int		 vsb_bcpy(struct vsb *, const void *, size_t);
 int		 vsb_cat(struct vsb *, const char *);
 int		 vsb_cpy(struct vsb *, const char *);
 int		 vsb_printf(struct vsb *, const char *, ...)
-    /* __printflike(2, 3) */;
+	/* __printflike(2, 3) */;
 #ifdef va_start
 int		 vsb_vprintf(struct vsb *, const char *, va_list)
-    /* __printflike(2, 0) */;
+	/* __printflike(2, 0) */;
 #endif
 int		 vsb_putc(struct vsb *, int);
 int		 vsb_trim(struct vsb *);
-int		 vsb_overflowed(const struct vsb *);
-void		 vsb_finish(struct vsb *);
+int		 vsb_error(const struct vsb *);
+int		 vsb_finish(struct vsb *);
 char		*vsb_data(struct vsb *);
 int		 vsb_len(struct vsb *);
 int		 vsb_done(const struct vsb *);
diff --git a/lib/libvarnish/cli_serve.c b/lib/libvarnish/cli_serve.c
index 347c396..f727b0b 100644
--- a/lib/libvarnish/cli_serve.c
+++ b/lib/libvarnish/cli_serve.c
@@ -290,7 +290,7 @@ cls_vlu2(void *priv, char * const *av)
 	} while (0);
 
 	vsb_finish(cli->sb);
-	AZ(vsb_overflowed(cli->sb));
+	AZ(vsb_error(cli->sb));
 
 	if (cs->after != NULL)
 		cs->after(cli);
@@ -347,7 +347,7 @@ cls_vlu(void *priv, const char *p)
 		}
 		cfd->argv = av;
 		cfd->last_idx = i - 2;
-		cfd->last_arg = vsb_newauto();
+		cfd->last_arg = vsb_new_auto();
 		AN(cfd->last_arg);
 		return (0);
 	} else {
@@ -360,7 +360,7 @@ cls_vlu(void *priv, const char *p)
 			return (0);
 		}
 		vsb_finish(cfd->last_arg);
-		AZ(vsb_overflowed(cfd->last_arg));
+		AZ(vsb_error(cfd->last_arg));
 		free(cfd->argv[cfd->last_idx]);
 		cfd->argv[cfd->last_idx] = NULL;
 		free(cfd->argv[cfd->last_idx + 1]);
@@ -410,7 +410,7 @@ CLS_AddFd(struct cls *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);
-	cfd->cli->sb = vsb_newauto();
+	cfd->cli->sb = vsb_new_auto();
 	cfd->closefunc = closefunc;
 	cfd->priv = priv;
 	AN(cfd->cli->sb);
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index 1983824..28333eb 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -409,7 +409,7 @@ vsb_trim(struct vsb *s)
  * Check if an vsb overflowed
  */
 int
-vsb_overflowed(const struct vsb *s)
+vsb_error(const struct vsb *s)
 {
 
 	return (VSB_HASOVERFLOWED(s));
@@ -418,7 +418,7 @@ vsb_overflowed(const struct vsb *s)
 /*
  * Finish off an vsb.
  */
-void
+int
 vsb_finish(struct vsb *s)
 {
 
@@ -428,6 +428,7 @@ vsb_finish(struct vsb *s)
 	s->s_buf[s->s_len] = '\0';
 	VSB_CLEARFLAG(s, VSB_OVERFLOWED);
 	VSB_SETFLAG(s, VSB_FINISHED);
+	return (0);
 }
 
 /*
diff --git a/lib/libvcl/vcc_backend.c b/lib/libvcl/vcc_backend.c
index 889b672..0fe8608 100644
--- a/lib/libvcl/vcc_backend.c
+++ b/lib/libvcl/vcc_backend.c
@@ -464,7 +464,7 @@ vcc_ParseHostDef(struct vcc *tl, int serial, const char *vgcname)
 
 	SkipToken(tl, '{');
 
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 	tl->fb = vsb;
 
@@ -603,7 +603,7 @@ vcc_ParseHostDef(struct vcc *tl, int serial, const char *vgcname)
 
 	tl->fb = NULL;
 	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
+	AZ(vsb_error(vsb));
 	Fh(tl, 0, "%s", vsb_data(vsb));
 	vsb_delete(vsb);
 
diff --git a/lib/libvcl/vcc_compile.c b/lib/libvcl/vcc_compile.c
index 1ac6069..df1d0e4 100644
--- a/lib/libvcl/vcc_compile.c
+++ b/lib/libvcl/vcc_compile.c
@@ -315,7 +315,7 @@ EmitInitFunc(const struct vcc *tl)
 
 	Fc(tl, 0, "\nstatic void\nVGC_Init(struct cli *cli)\n{\n\n");
 	vsb_finish(tl->fi);
-	AZ(vsb_overflowed(tl->fi));
+	AZ(vsb_error(tl->fi));
 	vsb_cat(tl->fc, vsb_data(tl->fi));
 	Fc(tl, 0, "}\n");
 }
@@ -335,7 +335,7 @@ EmitFiniFunc(const struct vcc *tl)
 		Fc(tl, 0, "\tvmod_priv_fini(&vmod_priv_%u);\n", u);
 
 	vsb_finish(tl->ff);
-	AZ(vsb_overflowed(tl->ff));
+	AZ(vsb_error(tl->ff));
 	vsb_cat(tl->fc, vsb_data(tl->ff));
 	Fc(tl, 0, "}\n");
 }
@@ -512,24 +512,24 @@ vcc_NewVcc(const struct vcc *tl0)
 	tl->ndirector = 1;
 
 	/* General C code */
-	tl->fc = vsb_newauto();
+	tl->fc = vsb_new_auto();
 	assert(tl->fc != NULL);
 
 	/* Forward decls (.h like) */
-	tl->fh = vsb_newauto();
+	tl->fh = vsb_new_auto();
 	assert(tl->fh != NULL);
 
 	/* Init C code */
-	tl->fi = vsb_newauto();
+	tl->fi = vsb_new_auto();
 	assert(tl->fi != NULL);
 
 	/* Finish C code */
-	tl->ff = vsb_newauto();
+	tl->ff = vsb_new_auto();
 	assert(tl->ff != NULL);
 
 	/* body code of methods */
 	for (i = 0; i < VCL_MET_MAX; i++) {
-		tl->fm[i] = vsb_newauto();
+		tl->fm[i] = vsb_new_auto();
 		assert(tl->fm[i] != NULL);
 	}
 	return (tl);
@@ -679,7 +679,7 @@ vcc_CompileSource(const struct vcc *tl0, struct vsb *sb, struct source *sp)
 		Fc(tl, 1, "VGC_function_%s (struct sess *sp)\n",
 		    method_tab[i].name);
 		vsb_finish(tl->fm[i]);
-		AZ(vsb_overflowed(tl->fm[i]));
+		AZ(vsb_error(tl->fm[i]));
 		Fc(tl, 1, "{\n");
 		Fc(tl, 1, "%s", vsb_data(tl->fm[i]));
 		Fc(tl, 1, "}\n");
@@ -695,10 +695,10 @@ vcc_CompileSource(const struct vcc *tl0, struct vsb *sb, struct source *sp)
 
 	/* Combine it all in the fh vsb */
 	vsb_finish(tl->fc);
-	AZ(vsb_overflowed(tl->fc));
+	AZ(vsb_error(tl->fc));
 	vsb_cat(tl->fh, vsb_data(tl->fc));
 	vsb_finish(tl->fh);
-	AZ(vsb_overflowed(tl->fh));
+	AZ(vsb_error(tl->fh));
 
 	of = strdup(vsb_data(tl->fh));
 	AN(of);
diff --git a/lib/libvcl/vcc_dir_dns.c b/lib/libvcl/vcc_dir_dns.c
index d5a4c34..5d2c761 100644
--- a/lib/libvcl/vcc_dir_dns.c
+++ b/lib/libvcl/vcc_dir_dns.c
@@ -87,7 +87,7 @@ print_backend(struct vcc *tl,
 	bprintf(strip, "%u.%u.%u.%u", ip[3], ip[2], ip[1], ip[0]);
 	tmptok.dec = strip;
 	bprintf(vgcname, "%.*s_%d", PF(tl->t_dir), serial);
-	vsb = vsb_newauto();
+	vsb = vsb_new_auto();
 	AN(vsb);
 	tl->fb = vsb;
 	Fc(tl, 0, "\t{ .host = VGC_backend_%s },\n",vgcname);
diff --git a/lib/libvcl/vcc_expr.c b/lib/libvcl/vcc_expr.c
index 9261963..1c14503 100644
--- a/lib/libvcl/vcc_expr.c
+++ b/lib/libvcl/vcc_expr.c
@@ -253,7 +253,7 @@ vcc_new_expr(void)
 	/* XXX: use TlAlloc() ? */
 	ALLOC_OBJ(e, EXPR_MAGIC);
 	AN(e);
-	e->vsb = vsb_newauto();
+	e->vsb = vsb_new_auto();
 	e->fmt = VOID;
 	return (e);
 }
@@ -270,7 +270,7 @@ vcc_mk_expr(enum var_type fmt, const char *str, ...)
 	vsb_vprintf(e->vsb, str, ap);
 	va_end(ap);
 	vsb_finish(e->vsb);
-	AZ(vsb_overflowed(e->vsb));
+	AZ(vsb_error(e->vsb));
 	return (e);
 }
 
@@ -346,7 +346,7 @@ vcc_expr_edit(enum var_type fmt, const char *p, struct expr *e1,
 		p++;
 	}
 	vsb_finish(e->vsb);
-	AZ(vsb_overflowed(e->vsb));
+	AZ(vsb_error(e->vsb));
 	if (e1 != NULL)
 		e->t1 = e1->t1;
 	else if (e2 != NULL)
@@ -697,7 +697,7 @@ vcc_expr4(struct vcc *tl, struct expr **e, enum var_type fmt)
 		e1->constant = 1;
 		vcc_NextToken(tl);
 		vsb_finish(e1->vsb);
-		AZ(vsb_overflowed(e1->vsb));
+		AZ(vsb_error(e1->vsb));
 		*e = e1;
 		break;
 	case CNUM:



More information about the varnish-commit mailing list