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.c | |
| parent | ffdd5e50e18b0cb212acad135e421d932cf3d3a2 (diff) | |
| download | glibc-1773d1ba5fa4c82e3a609f11742e159039b01c24.tar.gz glibc-1773d1ba5fa4c82e3a609f11742e159039b01c24.tar.xz 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.c')
| -rw-r--r-- | nss/getXXbyYY.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c index 6ec9097c04..854a3e859b 100644 --- a/nss/getXXbyYY.c +++ b/nss/getXXbyYY.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2001,2003 Free Software Foundation, Inc. +/* Copyright (C) 1996-2001,2003, 2004 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 @@ -66,15 +66,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 /* Prototype for reentrant version we use here. */ @@ -112,9 +107,7 @@ FUNCTION_NAME (ADD_PARAMS) if (buffer != NULL) { if (__nss_hostname_digits_dots (name, &resbuf, &buffer, - &buffer_size, - 0, &result, NULL, TYPE_VAR_P, - FLAGS_VAR, AF_VAR_P, + &buffer_size, 0, &result, NULL, AF_VAL, H_ERRNO_VAR_P)) goto done; } |