diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-05-26 06:42:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-05-26 06:42:16 +0000 |
| commit | 1773d1ba5fa4c82e3a609f11742e159039b01c24 (patch) | |
| tree | 971c00b818979ef1463d669f9b724988360e8220 /nss/getXXbyYY_r.c | |
| parent | ffdd5e50e18b0cb212acad135e421d932cf3d3a2 (diff) | |
| download | glibc-1773d1ba5fa4c82e3a609f11742e159039b01c24.tar glibc-1773d1ba5fa4c82e3a609f11742e159039b01c24.tar.gz glibc-1773d1ba5fa4c82e3a609f11742e159039b01c24.tar.bz2 glibc-1773d1ba5fa4c82e3a609f11742e159039b01c24.zip | |
Update.
2004-05-25 Ulrich Drepper <drepper@redhat.com>
* nss/digits_dots.c (__nss_hostname_digits_dots): Remove typep and
flags parameter, convert afp to simple int parameter. Adjust code.
typep was never != NULL and flags therefore also unused. *afp is
never modified.
* nss/nsswitch.h: Adjust __nss_hostname_digits_dots prototype.
* nss/getXXbyYY.c: Remove HAVE_TYPE handling. Adjust af parameter
handling for __nss_hostname_digits_dots calls.
* nss/getXXbyYY_r.c: Likewise.
* elf/dl-load.c (_dl_map_object_from_fd): Map DSOs with MAP_DENYWRITE.
Diffstat (limited to 'nss/getXXbyYY_r.c')
| -rw-r--r-- | nss/getXXbyYY_r.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index b17f33c8e0..6338aa5905 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -99,15 +99,10 @@ # define H_ERRNO_VAR_P NULL #endif -#ifndef HAVE_TYPE -# define TYPE_VAR_P NULL -# define FLAGS_VAR 0 -#endif - #ifdef HAVE_AF -# define AF_VAR_P &af +# define AF_VAL af #else -# define AF_VAR_P NULL +# define AF_VAL AF_INET #endif /* Type of the lookup function we need here. */ @@ -151,8 +146,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, #ifdef HANDLE_DIGITS_DOTS switch (__nss_hostname_digits_dots (name, resbuf, &buffer, NULL, - buflen, result, &status, - TYPE_VAR_P, FLAGS_VAR, AF_VAR_P, + buflen, result, &status, AF_VAL, H_ERRNO_VAR_P)) { case -1: |