[master] a4fdf38 Make VSS_connect() private to vss.c

Poul-Henning Kamp phk at FreeBSD.org
Wed Mar 11 23:53:01 CET 2015


commit a4fdf38a91089f44dd93fb1faa32ebf5b26cfc7c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 11 22:52:52 2015 +0000

    Make VSS_connect() private to vss.c

diff --git a/include/vss.h b/include/vss.h
index c331de4..1e1233c 100644
--- a/include/vss.h
+++ b/include/vss.h
@@ -37,5 +37,4 @@ int VSS_resolver(const char *addr, const char *def_port, vss_resolved_f *func,
 int VSS_resolve(const char *addr, const char *port, struct vss_addr ***ta);
 int VSS_bind(const struct vss_addr *addr);
 int VSS_listen(const struct vss_addr *addr, int depth);
-int VSS_connect(const struct vss_addr *addr, int nonblock);
 int VSS_open(const char *str, double tmo);
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 162153a..b837ac1 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -293,8 +293,8 @@ VSS_listen(const struct vss_addr *va, int depth)
  * Connect to the socket specified by the address info in va.
  * Return the socket.
  */
-int
-VSS_connect(const struct vss_addr *va, int nonblock)
+static int
+vss_connect(const struct vss_addr *va, int nonblock)
 {
 	int sd, i;
 
@@ -328,7 +328,7 @@ VSS_open(const char *str, double tmo)
 
 	nvaddr = VSS_resolve(str, NULL, &vaddr);
 	for (n = 0; n < nvaddr; n++) {
-		retval = VSS_connect(vaddr[n], tmo != 0.0);
+		retval = vss_connect(vaddr[n], tmo != 0.0);
 		if (retval >= 0 && tmo != 0.0) {
 			pfd.fd = retval;
 			pfd.events = POLLOUT;



More information about the varnish-commit mailing list