diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/base64.c | 5 | ||||
| -rw-r--r-- | resolv/gai_sigqueue.c | 5 | ||||
| -rw-r--r-- | resolv/gethnamaddr.c | 55 | ||||
| -rw-r--r-- | resolv/inet_net_ntop.c | 13 | ||||
| -rw-r--r-- | resolv/inet_neta.c | 5 | ||||
| -rw-r--r-- | resolv/inet_ntop.c | 16 | ||||
| -rw-r--r-- | resolv/inet_pton.c | 13 | ||||
| -rw-r--r-- | resolv/res_debug.c | 8 |
8 files changed, 27 insertions, 93 deletions
diff --git a/resolv/base64.c b/resolv/base64.c index 519e5d2..fedc086 100644 --- a/resolv/base64.c +++ b/resolv/base64.c @@ -191,10 +191,7 @@ libresolv_hidden_def (b64_ntop) */ int -b64_pton(src, target, targsize) - char const *src; - u_char *target; - size_t targsize; +b64_pton (char const *src, u_char *target, size_t targsize) { int tarindex, state, ch; char *pos; diff --git a/resolv/gai_sigqueue.c b/resolv/gai_sigqueue.c index e2c7878..b7edc84 100644 --- a/resolv/gai_sigqueue.c +++ b/resolv/gai_sigqueue.c @@ -22,10 +22,7 @@ #include <gai_misc.h> int -__gai_sigqueue (sig, val, caller_pid) - int sig; - const union sigval val; - pid_t caller_pid; +__gai_sigqueue (int sig, const union sigval val, pid_t caller_pid) { __set_errno (ENOSYS); return -1; diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c index 7fd0e49..3a8e9b1 100644 --- a/resolv/gethnamaddr.c +++ b/resolv/gethnamaddr.c @@ -147,9 +147,7 @@ extern int h_errno; #ifdef DEBUG static void -Dprintf(msg, num) - char *msg; - int num; +Dprintf (char *msg, int num) { if (_res.options & RES_DEBUG) { int save = errno; @@ -486,8 +484,7 @@ extern struct hostent *gethostbyname2(const char *name, int af); libresolv_hidden_proto (gethostbyname2) struct hostent * -gethostbyname(name) - const char *name; +gethostbyname (const char *name) { struct hostent *hp; @@ -504,9 +501,7 @@ gethostbyname(name) } struct hostent * -gethostbyname2(name, af) - const char *name; - int af; +gethostbyname2 (const char *name, int af) { union { @@ -637,10 +632,7 @@ gethostbyname2(name, af) libresolv_hidden_def (gethostbyname2) struct hostent * -gethostbyaddr(addr, len, af) - const void *addr; - socklen_t len; - int af; +gethostbyaddr (const void *addr, socklen_t len, int af) { const u_char *uaddr = (const u_char *)addr; static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff }; @@ -783,8 +775,7 @@ gethostbyaddr(addr, len, af) } void -_sethtent(f) - int f; +_sethtent (int f) { if (!hostf) hostf = fopen(_PATH_HOSTS, "rce" ); @@ -870,8 +861,7 @@ _gethtent (void) libresolv_hidden_def (_gethtent) struct hostent * -_gethtbyname(name) - const char *name; +_gethtbyname (const char *name) { struct hostent *hp; @@ -884,9 +874,7 @@ _gethtbyname(name) } struct hostent * -_gethtbyname2(name, af) - const char *name; - int af; +_gethtbyname2 (const char *name, int af) { struct hostent *p; char **cp; @@ -908,10 +896,7 @@ _gethtbyname2(name, af) libresolv_hidden_def (_gethtbyname2) struct hostent * -_gethtbyaddr(addr, len, af) - const char *addr; - size_t len; - int af; +_gethtbyaddr (const char *addr, size_t len, int af) { struct hostent *p; @@ -925,9 +910,7 @@ _gethtbyaddr(addr, len, af) libresolv_hidden_def (_gethtbyaddr) static void -map_v4v6_address(src, dst) - const char *src; - char *dst; +map_v4v6_address (const char *src, char *dst) { u_char *p = (u_char *)dst; char tmp[INADDRSZ]; @@ -945,10 +928,7 @@ map_v4v6_address(src, dst) } static void -map_v4v6_hostent(hp, bpp, lenp) - struct hostent *hp; - char **bpp; - int *lenp; +map_v4v6_hostent (struct hostent *hp, char **bpp, int *lenp) { char **ap; @@ -975,9 +955,7 @@ map_v4v6_hostent(hp, bpp, lenp) #ifdef RESOLVSORT extern void -addrsort(ap, num) - char **ap; - int num; +addrsort (char **ap, int num) { int i, j; char **p; @@ -1021,8 +999,7 @@ addrsort(ap, num) #if defined(BSD43_BSD43_NFS) || defined(sun) /* some libc's out there are bound internally to these names (UMIPS) */ void -ht_sethostent(stayopen) - int stayopen; +ht_sethostent (int stayopen) { _sethtent(stayopen); } @@ -1034,17 +1011,13 @@ ht_endhostent (void) } struct hostent * -ht_gethostbyname(name) - char *name; +ht_gethostbyname (char *name) { return (_gethtbyname(name)); } struct hostent * -ht_gethostbyaddr(addr, len, af) - const char *addr; - size_t len; - int af; +ht_gethostbyaddr (const char *addr, size_t len, int af) { return (_gethtbyaddr(addr, len, af)); } diff --git a/resolv/inet_net_ntop.c b/resolv/inet_net_ntop.c index e50c6a0..2d57ae3 100644 --- a/resolv/inet_net_ntop.c +++ b/resolv/inet_net_ntop.c @@ -49,12 +49,7 @@ static char * inet_net_ntop_ipv4 (const u_char *src, int bits, * Paul Vixie (ISC), July 1996 */ char * -inet_net_ntop(af, src, bits, dst, size) - int af; - const void *src; - int bits; - char *dst; - size_t size; +inet_net_ntop (int af, const void *src, int bits, char *dst, size_t size) { switch (af) { case AF_INET: @@ -79,11 +74,7 @@ inet_net_ntop(af, src, bits, dst, size) * Paul Vixie (ISC), July 1996 */ static char * -inet_net_ntop_ipv4(src, bits, dst, size) - const u_char *src; - int bits; - char *dst; - size_t size; +inet_net_ntop_ipv4 (const u_char *src, int bits, char *dst, size_t size) { char *odst = dst; char *t; diff --git a/resolv/inet_neta.c b/resolv/inet_neta.c index 349e6bd..b9f256b 100644 --- a/resolv/inet_neta.c +++ b/resolv/inet_neta.c @@ -46,10 +46,7 @@ static const char rcsid[] = "$BINDId: inet_neta.c,v 1.6 1999/01/08 19:23:45 vixi * Paul Vixie (ISC), July 1996 */ char * -inet_neta(src, dst, size) - u_int32_t src; - char *dst; - size_t size; +inet_neta (u_int32_t src, char *dst, size_t size) { char *odst = dst; char *tp; diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c index 6e89f2d..32338c5 100644 --- a/resolv/inet_ntop.c +++ b/resolv/inet_ntop.c @@ -56,11 +56,7 @@ static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size) * Paul Vixie, 1996. */ const char * -inet_ntop(af, src, dst, size) - int af; - const void *src; - char *dst; - socklen_t size; +inet_ntop (int af, const void *src, char *dst, socklen_t size) { switch (af) { case AF_INET: @@ -88,10 +84,7 @@ libc_hidden_def (inet_ntop) */ static const char * internal_function -inet_ntop4(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop4 (const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; @@ -111,10 +104,7 @@ inet_ntop4(src, dst, size) */ static const char * internal_function -inet_ntop6(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop6 (const u_char *src, char *dst, socklen_t size) { /* * Note that int32_t and int16_t need only be "at least" large enough diff --git a/resolv/inet_pton.c b/resolv/inet_pton.c index 3d88195..0d18e9a 100644 --- a/resolv/inet_pton.c +++ b/resolv/inet_pton.c @@ -49,10 +49,7 @@ static int inet_pton6 (const char *src, u_char *dst) internal_function; * Paul Vixie, 1996. */ int -__inet_pton(af, src, dst) - int af; - const char *src; - void *dst; +__inet_pton (int af, const char *src, void *dst) { switch (af) { case AF_INET: @@ -82,9 +79,7 @@ libc_hidden_weak (inet_pton) */ static int internal_function -inet_pton4(src, dst) - const char *src; - u_char *dst; +inet_pton4 (const char *src, u_char *dst) { int saw_digit, octets, ch; u_char tmp[NS_INADDRSZ], *tp; @@ -136,9 +131,7 @@ inet_pton4(src, dst) */ static int internal_function -inet_pton6(src, dst) - const char *src; - u_char *dst; +inet_pton6 (const char *src, u_char *dst) { static const char xdigits[] = "0123456789abcdef"; u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp; diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 7843439..6e76ea3 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -790,9 +790,7 @@ latlon2ul (const char **latlonstrptr, int *which) /* converts a zone file representation in a string to an RDATA on-the-wire * representation. */ int -loc_aton(ascii, binary) - const char *ascii; - u_char *binary; +loc_aton (const char *ascii, u_char *binary) { const char *cp, *maxcp; u_char *bcp; @@ -901,9 +899,7 @@ loc_aton(ascii, binary) /* takes an on-the-wire LOC RR and formats it in a human readable format. */ const char * -loc_ntoa(binary, ascii) - const u_char *binary; - char *ascii; +loc_ntoa (const u_char *binary, char *ascii) { static const char error[] = "?"; static char tmpbuf[sizeof |