diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
commit | 78be84cd747c2e3965bf6c2fd5f702d6ff2f5525 (patch) | |
tree | c070a60ef7c5371bef8b7a559442a6920b394c8e /libc/resolv | |
parent | de06548e980675e65a1e6d850bb8c3a3f7ec638d (diff) |
Merge changes between r16568 and r17050 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv')
-rw-r--r-- | libc/resolv/Makefile | 4 | ||||
-rw-r--r-- | libc/resolv/netdb.h | 95 | ||||
-rw-r--r-- | libc/resolv/res_libc.c | 2 |
3 files changed, 50 insertions, 51 deletions
diff --git a/libc/resolv/Makefile b/libc/resolv/Makefile index 95654a4be..6ddf91475 100644 --- a/libc/resolv/Makefile +++ b/libc/resolv/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994-2001,2003,2004,2007,2008,2011 +# Copyright (C) 1994-2001,2003,2004,2007,2008,2011,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -94,7 +94,7 @@ CFLAGS-res_hconf.c = -fexceptions $(objpfx)libresolv.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a # Some hosts need '__stack_chk_guard', so pull in the definition from # ld.so if required. -ifeq (yesyes,$(have-ssp)$(elf)) +ifeq (yes,$(have-ssp)) LDLIBS-resolv.so += $(as-needed) $(elfobjdir)/ld.so $(no-as-needed) endif diff --git a/libc/resolv/netdb.h b/libc/resolv/netdb.h index 6b76a25d3..551b4c7a0 100644 --- a/libc/resolv/netdb.h +++ b/libc/resolv/netdb.h @@ -1,4 +1,4 @@ - /* Copyright (C) 1996-2004, 2009, 2010, 2011 Free Software Foundation, Inc. + /* Copyright (C) 1996-2004, 2009-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -90,10 +90,10 @@ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); #ifdef __USE_MISC /* Print error indicated by `h_errno' variable on standard error. STR if non-null is printed before the error string. */ -extern void herror (__const char *__str) __THROW; +extern void herror (const char *__str) __THROW; /* Return string associated with error ERR_NUM. */ -extern __const char *hstrerror (int __err_num) __THROW; +extern const char *hstrerror (int __err_num) __THROW; #endif @@ -135,14 +135,14 @@ extern struct hostent *gethostent (void); This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct hostent *gethostbyaddr (__const void *__addr, __socklen_t __len, +extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len, int __type); /* Return entry from host data base for host with NAME. This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct hostent *gethostbyname (__const char *__name); +extern struct hostent *gethostbyname (const char *__name); #ifdef __USE_MISC /* Return entry from host data base for host with NAME. AF must be @@ -153,7 +153,7 @@ extern struct hostent *gethostbyname (__const char *__name); cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern struct hostent *gethostbyname2 (__const char *__name, int __af); +extern struct hostent *gethostbyname2 (const char *__name, int __af); /* Reentrant versions of the functions above. The additional arguments specify a buffer of BUFLEN starting at BUF. The last @@ -170,20 +170,20 @@ extern int gethostent_r (struct hostent *__restrict __result_buf, struct hostent **__restrict __result, int *__restrict __h_errnop); -extern int gethostbyaddr_r (__const void *__restrict __addr, __socklen_t __len, +extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len, int __type, struct hostent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct hostent **__restrict __result, int *__restrict __h_errnop); -extern int gethostbyname_r (__const char *__restrict __name, +extern int gethostbyname_r (const char *__restrict __name, struct hostent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct hostent **__restrict __result, int *__restrict __h_errnop); -extern int gethostbyname2_r (__const char *__restrict __name, int __af, +extern int gethostbyname2_r (const char *__restrict __name, int __af, struct hostent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct hostent **__restrict __result, @@ -222,7 +222,7 @@ extern struct netent *getnetbyaddr (uint32_t __net, int __type); This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct netent *getnetbyname (__const char *__name); +extern struct netent *getnetbyname (const char *__name); #ifdef __USE_MISC /* Reentrant versions of the functions above. The additional @@ -246,7 +246,7 @@ extern int getnetbyaddr_r (uint32_t __net, int __type, struct netent **__restrict __result, int *__restrict __h_errnop); -extern int getnetbyname_r (__const char *__restrict __name, +extern int getnetbyname_r (const char *__restrict __name, struct netent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct netent **__restrict __result, @@ -288,15 +288,14 @@ extern struct servent *getservent (void); This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct servent *getservbyname (__const char *__name, - __const char *__proto); +extern struct servent *getservbyname (const char *__name, const char *__proto); /* Return entry from service data base which matches port PORT and protocol PROTO. This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct servent *getservbyport (int __port, __const char *__proto); +extern struct servent *getservbyport (int __port, const char *__proto); #ifdef __USE_MISC @@ -311,13 +310,13 @@ extern int getservent_r (struct servent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct servent **__restrict __result); -extern int getservbyname_r (__const char *__restrict __name, - __const char *__restrict __proto, +extern int getservbyname_r (const char *__restrict __name, + const char *__restrict __proto, struct servent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct servent **__restrict __result); -extern int getservbyport_r (int __port, __const char *__restrict __proto, +extern int getservbyport_r (int __port, const char *__restrict __proto, struct servent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct servent **__restrict __result); @@ -356,7 +355,7 @@ extern struct protoent *getprotoent (void); This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct protoent *getprotobyname (__const char *__name); +extern struct protoent *getprotobyname (const char *__name); /* Return entry from protocol data base which number is PROTO. @@ -377,7 +376,7 @@ extern int getprotoent_r (struct protoent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct protoent **__restrict __result); -extern int getprotobyname_r (__const char *__restrict __name, +extern int getprotobyname_r (const char *__restrict __name, struct protoent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, struct protoent **__restrict __result); @@ -394,7 +393,7 @@ extern int getprotobynumber_r (int __proto, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int setnetgrent (__const char *__netgroup); +extern int setnetgrent (const char *__netgroup); /* Free all space allocated by previous `setnetgrent' call. @@ -422,8 +421,8 @@ extern int getnetgrent (char **__restrict __hostp, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int innetgr (__const char *__netgroup, __const char *__host, - __const char *__user, __const char *__domain); +extern int innetgr (const char *__netgroup, const char *__host, + const char *__user, const char *__domain); /* Reentrant version of `getnetgrent' where result is placed in BUFFER. @@ -451,9 +450,9 @@ extern int getnetgrent_r (char **__restrict __hostp, or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ extern int rcmd (char **__restrict __ahost, unsigned short int __rport, - __const char *__restrict __locuser, - __const char *__restrict __remuser, - __const char *__restrict __cmd, int *__restrict __fd2p); + const char *__restrict __locuser, + const char *__restrict __remuser, + const char *__restrict __cmd, int *__restrict __fd2p); /* This is the equivalent function where the protocol can be selected and which therefore can be used for IPv6. @@ -463,9 +462,9 @@ extern int rcmd (char **__restrict __ahost, unsigned short int __rport, or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport, - __const char *__restrict __locuser, - __const char *__restrict __remuser, - __const char *__restrict __cmd, int *__restrict __fd2p, + const char *__restrict __locuser, + const char *__restrict __remuser, + const char *__restrict __cmd, int *__restrict __fd2p, sa_family_t __af); /* Call `rexecd' at port RPORT on remote machine *AHOST to execute @@ -479,9 +478,9 @@ extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport, or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ extern int rexec (char **__restrict __ahost, int __rport, - __const char *__restrict __name, - __const char *__restrict __pass, - __const char *__restrict __cmd, int *__restrict __fd2p); + const char *__restrict __name, + const char *__restrict __pass, + const char *__restrict __cmd, int *__restrict __fd2p); /* This is the equivalent function where the protocol can be selected and which therefore can be used for IPv6. @@ -491,9 +490,9 @@ extern int rexec (char **__restrict __ahost, int __rport, or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ extern int rexec_af (char **__restrict __ahost, int __rport, - __const char *__restrict __name, - __const char *__restrict __pass, - __const char *__restrict __cmd, int *__restrict __fd2p, + const char *__restrict __name, + const char *__restrict __pass, + const char *__restrict __cmd, int *__restrict __fd2p, sa_family_t __af); /* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER. @@ -504,8 +503,8 @@ extern int rexec_af (char **__restrict __ahost, int __rport, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int ruserok (__const char *__rhost, int __suser, - __const char *__remuser, __const char *__locuser); +extern int ruserok (const char *__rhost, int __suser, + const char *__remuser, const char *__locuser); /* This is the equivalent function where the protocol can be selected and which therefore can be used for IPv6. @@ -514,8 +513,8 @@ extern int ruserok (__const char *__rhost, int __suser, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int ruserok_af (__const char *__rhost, int __suser, - __const char *__remuser, __const char *__locuser, +extern int ruserok_af (const char *__rhost, int __suser, + const char *__remuser, const char *__locuser, sa_family_t __af); /* Check whether user REMUSER on system indicated by IPv4 address @@ -528,7 +527,7 @@ extern int ruserok_af (__const char *__rhost, int __suser, or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ extern int iruserok (uint32_t __raddr, int __suser, - __const char *__remuser, __const char *__locuser); + const char *__remuser, const char *__locuser); /* This is the equivalent function where the pfamiliy if the address pointed to by RADDR is determined by the value of AF. It therefore @@ -538,8 +537,8 @@ extern int iruserok (uint32_t __raddr, int __suser, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int iruserok_af (__const void *__raddr, int __suser, - __const char *__remuser, __const char *__locuser, +extern int iruserok_af (const void *__raddr, int __suser, + const char *__remuser, const char *__locuser, sa_family_t __af); /* Try to allocate reserved port, returning a descriptor for a socket opened @@ -661,22 +660,22 @@ struct gaicb This function is a possible cancellation point and therefore not marked with __THROW. */ -extern int getaddrinfo (__const char *__restrict __name, - __const char *__restrict __service, - __const struct addrinfo *__restrict __req, +extern int getaddrinfo (const char *__restrict __name, + const char *__restrict __service, + const struct addrinfo *__restrict __req, struct addrinfo **__restrict __pai); /* Free `addrinfo' structure AI including associated storage. */ extern void freeaddrinfo (struct addrinfo *__ai) __THROW; /* Convert error return from getaddrinfo() to a string. */ -extern __const char *gai_strerror (int __ecode) __THROW; +extern const char *gai_strerror (int __ecode) __THROW; /* Translate a socket address to a location and service name. This function is a possible cancellation point and therefore not marked with __THROW. */ -extern int getnameinfo (__const struct sockaddr *__restrict __sa, +extern int getnameinfo (const struct sockaddr *__restrict __sa, socklen_t __salen, char *__restrict __host, socklen_t __hostlen, char *__restrict __serv, socklen_t __servlen, int __flags); @@ -702,8 +701,8 @@ extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr], cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int gai_suspend (__const struct gaicb *__const __list[], int __ent, - __const struct timespec *__timeout); +extern int gai_suspend (const struct gaicb *const __list[], int __ent, + const struct timespec *__timeout); /* Get the error status of the request REQ. */ extern int gai_error (struct gaicb *__req) __THROW; diff --git a/libc/resolv/res_libc.c b/libc/resolv/res_libc.c index cba040aea..b3b0c4e67 100644 --- a/libc/resolv/res_libc.c +++ b/libc/resolv/res_libc.c @@ -144,7 +144,7 @@ extern __thread struct __res_state *__libc_resp /* We declare this with compat_symbol so that it's not visible at link time. Programs must use the accessor functions. */ -#if defined HAVE_ELF && defined SHARED +#if defined SHARED # include <shlib-compat.h> invisible_compat_symbol (libc, _res, GLIBC_2_0); #endif |