[master] 14d8ae3 Be a tiny bit more systematic about naming typedefs

[Poul-Henning Kamp]

commit 14d8ae32bad474de3f8da94298fb627eaa75322d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 11 22:10:36 2015 +0000

    Be a tiny bit more systematic about naming typedefs

diff --git a/include/vss.h b/include/vss.h
index f3c040e..c331de4 100644
--- a/include/vss.h
+++ b/include/vss.h
@@ -30,8 +30,8 @@
 struct vss_addr;
 struct suckaddr;
 
-typedef int resolved_f(void *priv, const struct suckaddr *);
-int VSS_resolver(const char *addr, const char *def_port, resolved_f *func,
+typedef int vss_resolved_f(void *priv, const struct suckaddr *);
+int VSS_resolver(const char *addr, const char *def_port, vss_resolved_f *func,
    void *priv, const char **err);
 
 int VSS_resolve(const char *addr, const char *port, struct vss_addr ***ta);
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 9614058..162153a 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -114,7 +114,7 @@ vss_parse(char *str, char **addr, char **port)
  */
 
 int
-VSS_resolver(const char *addr, const char *def_port, resolved_f *func,
+VSS_resolver(const char *addr, const char *def_port, vss_resolved_f *func,
     void *priv, const char **err)
 {
 	struct addrinfo hints, *res0, *res;
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index fcbcb07..694294c 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -148,7 +148,7 @@ struct rss {
 	struct suckaddr		*vsa6;
 };
 
-static int __match_proto__(resolved_f)
+static int __match_proto__(vss_resolved_f)
 rs_callback(void *priv, const struct suckaddr *vsa)
 {
 	struct rss *rss;
@@ -174,7 +174,7 @@ rs_callback(void *priv, const struct suckaddr *vsa)
 	return (0);
 }
 
-static int __match_proto__(resolved_f)
+static int __match_proto__(vss_resolved_f)
 rs_callback2(void *priv, const struct suckaddr *vsa)
 {
 	struct vcc *tl;