[master] a9ebb3b Make VSS_parse() static, as it is no longer, and should no longer be used outside vss.c

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


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

    Make VSS_parse() static, as it is no longer, and should no longer
    be used outside vss.c

diff --git a/include/vss.h b/include/vss.h
index c65a18f..f3c040e 100644
--- a/include/vss.h
+++ b/include/vss.h
@@ -30,8 +30,6 @@
 struct vss_addr;
 struct suckaddr;
 
-const char *VSS_parse(char *str, char **addr, char **port);
-
 typedef int resolved_f(void *priv, const struct suckaddr *);
 int VSS_resolver(const char *addr, const char *def_port, resolved_f *func,
    void *priv, const char **err);
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index d88bb3e..9614058 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -72,8 +72,8 @@ struct vss_addr {
  * See also RFC5952
  */
 
-const char *
-VSS_parse(char *str, char **addr, char **port)
+static const char *
+vss_parse(char *str, char **addr, char **port)
 {
 	char *p;
 
@@ -126,7 +126,7 @@ VSS_resolver(const char *addr, const char *def_port, resolved_f *func,
 	*err = NULL;
 	h = strdup(addr);
 	AN(h);
-	*err = VSS_parse(h, &hop, &adp);
+	*err = vss_parse(h, &hop, &adp);
 	if (*err != NULL) {
 		free(h);
 		return (-1);
@@ -189,7 +189,7 @@ VSS_resolve(const char *addr, const char *port, struct vss_addr ***vap)
 
 	h = strdup(addr);
 	AN(h);
-	if (VSS_parse(h, &hop, &adp) != NULL) {
+	if (vss_parse(h, &hop, &adp) != NULL) {
 		free(h);
 		return (0);
 	}



More information about the varnish-commit mailing list