summaryrefslogtreecommitdiff
path: root/sysdeps/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-18 06:46:52 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-18 06:46:52 +0000
commit7a11603dc6bde67066ce6f8d4c5f6b86bebaf3c1 (patch)
tree310fc0913c5e35b0a6e05bfab4423e38012e6ecf /sysdeps/posix
parentf04b1e1f0f86cce932ede5b5a088c0ec4712ce34 (diff)
Update.
2004-09-17 Ulrich Drepper <drepper@redhat.com> * include/link.h (struct link_map): Add l_used element. * sysdeps/generic/ldsodefs.h: Define DL_DEBUG_UNUSED. * elf/rtld.c (process_dl_debug): Recognize unused. (dl_main): When unused debug flag is set check for unused direct dependencies. When printing dependencies and SONAME starts with /, omit the SONAME => part. * elf/dl-lookup.c (_dl_lookup_symbol_x): Mark object in which the symbol has been found as used. * elf/ldd.bash.in: Add -u option.
Diffstat (limited to 'sysdeps/posix')
-rw-r--r--sysdeps/posix/getaddrinfo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index c8cb752b18..f9d0bf42fe 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -293,8 +293,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
no_data = 0; \
while (1) { \
rc = 0; \
- status = DL_CALL_FCT (fct, (name, _family, &th, tmpbuf, \
- tmpbuflen, &rc, &herrno, NULL, &localcanon)); \
+ status = DL_CALL_FCT (fct, (name, _family, &th, tmpbuf, tmpbuflen, \
+ &rc, &herrno, NULL, &localcanon)); \
if (rc != ERANGE || herrno != NETDB_INTERNAL) \
break; \
tmpbuf = extend_alloca (tmpbuf, tmpbuflen, 2 * tmpbuflen); \
@@ -343,7 +343,7 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
pat = &((*pat)->next); \
} \
\
- if (localcanon != NULL) \
+ if (localcanon != NULL && canon == NULL) \
canon = strdupa (localcanon); \
\
if (_family == AF_INET6 && i > 0) \