[master] ce581db Call it "cli_name" instead of "display_name"

[Poul-Henning Kamp]

commit ce581db32acf2f381ec4596c6a1d873779194b1c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 23 20:52:00 2018 +0000

    Call it "cli_name" instead of "display_name"

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 610132a..90e9a4b 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -90,7 +90,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
 
 	if (!VDI_Healthy(bp->director, NULL)) {
 		VSLb(bo->vsl, SLT_FetchError,
-		     "backend %s: unhealthy", bp->director->display_name);
+		     "backend %s: unhealthy", bp->director->cli_name);
 		// XXX: per backend stats ?
 		VSC_C_main->backend_unhealthy++;
 		return (NULL);
@@ -98,7 +98,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
 
 	if (bp->max_connections > 0 && bp->n_conn >= bp->max_connections) {
 		VSLb(bo->vsl, SLT_FetchError,
-		     "backend %s: busy", bp->director->display_name);
+		     "backend %s: busy", bp->director->cli_name);
 		// XXX: per backend stats ?
 		VSC_C_main->backend_busy++;
 		return (NULL);
@@ -118,7 +118,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
 	if (pfd == NULL) {
 		VSLb(bo->vsl, SLT_FetchError,
 		     "backend %s: fail errno %d (%s)",
-		     bp->director->display_name, errno, strerror(errno));
+		     bp->director->cli_name, errno, strerror(errno));
 		// XXX: Per backend stats ?
 		VSC_C_main->backend_fail++;
 		bo->htc = NULL;
@@ -141,7 +141,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
 	PFD_LocalName(pfd, abuf1, sizeof abuf1, pbuf1, sizeof pbuf1);
 	PFD_RemoteName(pfd, abuf2, sizeof abuf2, pbuf2, sizeof pbuf2);
 	VSLb(bo->vsl, SLT_BackendOpen, "%d %s %s %s %s %s",
-	    *fdp, bp->director->display_name, abuf2, pbuf2, abuf1, pbuf1);
+	    *fdp, bp->director->cli_name, abuf2, pbuf2, abuf1, pbuf1);
 
 	INIT_OBJ(bo->htc, HTTP_CONN_MAGIC);
 	bo->htc->priv = pfd;
@@ -185,14 +185,14 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 		    bo->htc->doclose == SC_RX_TIMEOUT);
 	if (bo->htc->doclose != SC_NULL || bp->proxy_header != 0) {
 		VSLb(bo->vsl, SLT_BackendClose, "%d %s", *PFD_Fd(pfd),
-		    bp->director->display_name);
+		    bp->director->cli_name);
 		VTP_Close(&pfd);
 		AZ(pfd);
 		Lck_Lock(&bp->mtx);
 	} else {
 		assert (PFD_State(pfd) == PFD_STATE_USED);
 		VSLb(bo->vsl, SLT_BackendReuse, "%d %s", *PFD_Fd(pfd),
-		    bp->director->display_name);
+		    bp->director->cli_name);
 		Lck_Lock(&bp->mtx);
 		VSC_C_main->backend_recycle++;
 		VTP_Recycle(wrk, &pfd);
@@ -406,7 +406,7 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(bp, d->priv, BACKEND_MAGIC);
 
-	VSB_printf(vsb, "display_name = %s,\n", bp->director->display_name);
+	VSB_printf(vsb, "cli_name = %s,\n", bp->director->cli_name);
 	if (bp->ipv4_addr != NULL)
 		VSB_printf(vsb, "ipv4 = %s,\n", bp->ipv4_addr);
 	if (bp->ipv6_addr != NULL)
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 478ad18..d180101 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -186,7 +186,7 @@ vbp_update_backend(struct vbp_target *vt)
 			vt->backend->director->health = 0;
 		}
 		VSL(SLT_Backend_health, 0, "%s %s %s %u %u %u %.6f %.6f %s",
-		    vt->backend->director->display_name, logmsg, bits,
+		    vt->backend->director->cli_name, logmsg, bits,
 		    vt->good, vt->threshold, vt->window,
 		    vt->last, vt->avg, vt->resp_buf);
 		VBE_SetHappy(vt->backend, vt->happy);
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index bfc931a..3ea2710 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -293,7 +293,7 @@ do_list(struct cli *cli, struct director *d, void *priv)
 	if (d->admin_health == VDI_AH_DELETED)
 		return (0);
 
-	VCLI_Out(cli, "\n%-30s", d->display_name);
+	VCLI_Out(cli, "\n%-30s", d->cli_name);
 
 	VCLI_Out(cli, " %-10s", VDI_Ahealth(d));
 
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 9e98da7..ba72d8b 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -80,7 +80,7 @@ struct director {
 
 	/* Internal Housekeeping fields */
 
-	char			*display_name;
+	char			*cli_name;
 	VTAILQ_ENTRY(director)	vcl_list;
 	struct vcl		*vcl;
 
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index c4d9ae1..2e17896 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -227,7 +227,7 @@ vcl_iterdir(struct cli *cli, const char *pat, const struct vcl *vcl,
 	struct director *d;
 
 	VTAILQ_FOREACH(d, &vcl->director_list, vcl_list) {
-		if (fnmatch(pat, d->display_name, 0))
+		if (fnmatch(pat, d->cli_name, 0))
 			continue;
 		found++;
 		i = func(cli, d, priv);
@@ -309,7 +309,7 @@ vcl_KillBackends(struct vcl *vcl)
 			break;
 		VTAILQ_REMOVE(&vcl->director_list, d, vcl_list);
 		AN(d->destroy);
-		REPLACE(d->display_name, NULL);
+		REPLACE(d->cli_name, NULL);
 		d->destroy(d);
 	}
 }
diff --git a/bin/varnishd/cache/cache_vcl_vrt.c b/bin/varnishd/cache/cache_vcl_vrt.c
index 36bdf3f..ce94c75 100644
--- a/bin/varnishd/cache/cache_vcl_vrt.c
+++ b/bin/varnishd/cache/cache_vcl_vrt.c
@@ -138,7 +138,7 @@ VCL_AddDirector(struct vcl *vcl, struct director *d, const char *vcl_name)
 	AN(vsb);
 	VSB_printf(vsb, "%s.%s", VCL_Name(vcl), vcl_name);
 	AZ(VSB_finish(vsb));
-	REPLACE((d->display_name), VSB_data(vsb));
+	REPLACE((d->cli_name), VSB_data(vsb));
 	VSB_destroy(&vsb);
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
@@ -179,7 +179,7 @@ VCL_DelDirector(struct director *d)
 		VDI_Event(d, VCL_EVENT_COLD);
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
 	AN(d->destroy);
-	REPLACE(d->display_name, NULL);
+	REPLACE(d->cli_name, NULL);
 	d->destroy(d);
 }