This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] nss_dns: Replace local declarations with declarations from a header file
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Tue, 04 Apr 2017 21:01:27 +0200
- Subject: [PATCH COMMITTED] nss_dns: Replace local declarations with declarations from a header file
- Authentication-results: sourceware.org; auth=none
- Authentication-results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
- Authentication-results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer at redhat dot com
- Dkim-filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AE9C9C04B956
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AE9C9C04B956
2017-04-04 Florian Weimer <fweimer@redhat.com>
* include/arpa/nameser.h (__ns_name_ntop, __ns_name_unpack):
Declare.
* resolv/nss_dns/dns-network.c: Include <arpa/nameser.h>.
(NS_MAXCDNAME): Remove definition.
(__ns_name_ntop, __ns_name_unpack): Remove declaration.
* resolv/nss_dns/dns-host.c: Include <arpa/nameser.h>.
(NS_MAXCDNAME): Remove definition.
(__ns_name_ntop, __ns_name_unpack): Remove declaration.
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index cd7ab6e..7a8290e 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -51,6 +51,9 @@ extern const struct _ns_flagdata _ns_flagdata[] attribute_hidden;
extern unsigned int __ns_get16 (const unsigned char *) __THROW;
extern unsigned long __ns_get32 (const unsigned char *) __THROW;
+int __ns_name_ntop (const unsigned char *, char *, size_t) __THROW;
+int __ns_name_unpack (const unsigned char *, const unsigned char *,
+ const unsigned char *, unsigned char *, size_t) __THROW;
#define ns_msg_getflag(handle, flag) \
(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift)
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 01864dc..705b3c9 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -80,6 +80,7 @@
#include <string.h>
#include "nsswitch.h"
+#include <arpa/nameser.h>
/* Get implementeation for some internal functions. */
#include <resolv/resolv-internal.h>
@@ -106,13 +107,6 @@ typedef union querybuf
u_char buf[MAXPACKET];
} querybuf;
-/* These functions are defined in res_comp.c. */
-#define NS_MAXCDNAME 255 /* maximum compressed domain name */
-extern int __ns_name_ntop (const u_char *, char *, size_t);
-extern int __ns_name_unpack (const u_char *, const u_char *,
- const u_char *, u_char *, size_t);
-
-
static enum nss_status getanswer_r (const querybuf *answer, int anslen,
const char *qname, int qtype,
struct hostent *result, char *buffer,
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index fd8c565..2be72d3 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -66,6 +66,7 @@
#include "nsswitch.h"
#include <arpa/inet.h>
+#include <arpa/nameser.h>
/* Maximum number of aliases we allow. */
#define MAX_NR_ALIASES 48
@@ -92,13 +93,6 @@ typedef union querybuf
u_char buf[MAXPACKET];
} querybuf;
-/* These functions are defined in res_comp.c. */
-#define NS_MAXCDNAME 255 /* maximum compressed domain name */
-extern int __ns_name_ntop (const u_char *, char *, size_t) __THROW;
-extern int __ns_name_unpack (const u_char *, const u_char *,
- const u_char *, u_char *, size_t) __THROW;
-
-
/* Prototypes for local functions. */
static enum nss_status getanswer_r (const querybuf *answer, int anslen,
struct netent *result, char *buffer,