AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss_dns: Replace local declarations with declarations from a header file

Browse Source
This commit is contained in:
Florian Weimer 2017-04-04 14:36:02 +02:00
parent 75b3a15e07
commit 44f28da7ca
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
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.
2017-04-04 Florian Weimer <fweimer@redhat.com> 2017-04-04 Florian Weimer <fweimer@redhat.com>
* resolv/nss_dns/dns-network.c (getanswer_r): Remove __dn_expand * resolv/nss_dns/dns-network.c (getanswer_r): Remove __dn_expand

3
include/arpa/nameser.h
View File

@ -51,6 +51,9 @@ extern const struct _ns_flagdata _ns_flagdata[] attribute_hidden;
extern unsigned int __ns_get16 (const unsigned char *) __THROW; extern unsigned int __ns_get16 (const unsigned char *) __THROW;
extern unsigned long __ns_get32 (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) \ #define ns_msg_getflag(handle, flag) \
(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift) (((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift)

8
resolv/nss_dns/dns-host.c
View File

@ -80,6 +80,7 @@
#include <string.h> #include <string.h>
#include "nsswitch.h" #include "nsswitch.h"
#include <arpa/nameser.h>
/* Get implementeation for some internal functions. */ /* Get implementeation for some internal functions. */
#include <resolv/resolv-internal.h> #include <resolv/resolv-internal.h>
@ -106,13 +107,6 @@ typedef union querybuf
u_char buf[MAXPACKET]; u_char buf[MAXPACKET];
} querybuf; } 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, static enum nss_status getanswer_r (const querybuf *answer, int anslen,
const char *qname, int qtype, const char *qname, int qtype,
struct hostent *result, char *buffer, struct hostent *result, char *buffer,

8
resolv/nss_dns/dns-network.c
View File

@ -66,6 +66,7 @@
#include "nsswitch.h" #include "nsswitch.h"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <arpa/nameser.h>
/* Maximum number of aliases we allow. */ /* Maximum number of aliases we allow. */
#define MAX_NR_ALIASES 48 #define MAX_NR_ALIASES 48
@ -92,13 +93,6 @@ typedef union querybuf
u_char buf[MAXPACKET]; u_char buf[MAXPACKET];
} querybuf; } 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. */ /* Prototypes for local functions. */
static enum nss_status getanswer_r (const querybuf *answer, int anslen, static enum nss_status getanswer_r (const querybuf *answer, int anslen,
struct netent *result, char *buffer, struct netent *result, char *buffer,