From c98bf5b8691b21373ff8d9698e89a75acdefdc75 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 7 Sep 2018 15:51:00 -0400 Subject: 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. --- src/network/dns_parse.c | 1 + src/network/getnameinfo.c | 1 - src/network/lookup.h | 2 ++ src/network/lookup_name.c | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/network/dns_parse.c b/src/network/dns_parse.c index 0c7a6011..e6ee19d9 100644 --- a/src/network/dns_parse.c +++ b/src/network/dns_parse.c @@ -1,4 +1,5 @@ #include +#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 5e6fae3e..79b9e6ea 100644 --- 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 0468edbc..329aaa77 100644 --- 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 1bce4347..71c396a8 100644 --- 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 *); -- cgit v1.2.1