[master] 8966942 Rename list to vcl_list

[Poul-Henning Kamp]

commit 896694276723c1612efd616589dcff9dda51b514
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 09:56:43 2017 +0000

    Rename list to vcl_list

diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 5743c94..360da41 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;
-	VTAILQ_ENTRY(director)	list;
+	VTAILQ_ENTRY(director)	vcl_list;
 	struct vcl		*vcl;
 
 	unsigned		health;
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index e3977da..36b64c5 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -349,7 +349,7 @@ VCL_AddDirector(struct vcl *vcl, struct director *d, const char *vcl_name)
 	}
 
 	Lck_Lock(&vcl_mtx);
-	VTAILQ_INSERT_TAIL(&vcl->director_list, d, list);
+	VTAILQ_INSERT_TAIL(&vcl->director_list, d, vcl_list);
 	d->vcl = vcl;
 	Lck_Unlock(&vcl_mtx);
 
@@ -372,7 +372,7 @@ VCL_DelDirector(struct director *d)
 	vcl = d->vcl;
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	Lck_Lock(&vcl_mtx);
-	VTAILQ_REMOVE(&vcl->director_list, d, list);
+	VTAILQ_REMOVE(&vcl->director_list, d, vcl_list);
 	Lck_Unlock(&vcl_mtx);
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
@@ -393,7 +393,7 @@ vcl_BackendEvent(const struct vcl *vcl, enum vcl_event_e e)
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	AZ(vcl->busy);
 
-	VTAILQ_FOREACH(d, &vcl->director_list, list)
+	VTAILQ_FOREACH(d, &vcl->director_list, vcl_list)
 		VDI_Event(d, e);
 }
 
@@ -409,7 +409,7 @@ vcl_KillBackends(struct vcl *vcl)
 		d = VTAILQ_FIRST(&vcl->director_list);
 		if (d == NULL)
 			break;
-		VTAILQ_REMOVE(&vcl->director_list, d, list);
+		VTAILQ_REMOVE(&vcl->director_list, d, vcl_list);
 		AN(d->destroy);
 		d->destroy(d);
 	}