move and deduplicate declarations of __dns_parse to make it checkable

the source file for this function is completely standalone, but it
doesn't seem worth adding a header just for it, so declare it in
lookup.h for now.

diff --git a/src/network/dns_parse.c b/src/network/dns_parse.c
index 0c7a60112473974601e86ac8fb0712dcb5fe3083..e6ee19d9a6f88d0608cc43eb438c70d35813a78b 100644 (file)
--- a/src/network/dns_parse.c
+++ b/src/network/dns_parse.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include "lookup.h"
 
 int __dns_parse(const unsigned char *r, int rlen, int (*callback)(void *, int, const void *, int, const void *), void *ctx)
 {

diff --git a/src/network/getnameinfo.c b/src/network/getnameinfo.c
index 5e6fae3ed0e517e4a8a76c9b8ca5e75b99a31c3a..79b9e6ea01782f7adb46d39c6acb85465e051c77 100644 (file)
--- a/src/network/getnameinfo.c
+++ b/src/network/getnameinfo.c
@@ -10,7 +10,6 @@
 #include "lookup.h"
 #include "stdio_impl.h"
 
-int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
 int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
 int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
 int __res_send(const unsigned char *, int, unsigned char *, int);

diff --git a/src/network/lookup.h b/src/network/lookup.h
index 0468edbc61c569d260fa2709ae719256523844b4..329aaa77108e43a10e1c2fb4b78f3dbe4211c472 100644 (file)
--- a/src/network/lookup.h
+++ b/src/network/lookup.h
@@ -36,4 +36,6 @@ int __lookup_ipliteral(struct address buf[static 1], const char *name, int famil
 
 int __get_resolv_conf(struct resolvconf *, char *, size_t);
 
+int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
+
 #endif

diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c
index 1bce43471c8231476e485a91b6c169a735e597eb..71c396a8894867aac08cfc075d94667ad36385bb 100644 (file)
--- a/src/network/lookup_name.c
+++ b/src/network/lookup_name.c
@@ -98,7 +98,6 @@ struct dpc_ctx {
        int cnt;
 };
 
-int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
 int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
 int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
 int __res_msend_rc(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int, const struct resolvconf *);