From ee600e3f76afbdc92c3258c362b6c061ada58b21 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 10 Jul 2004 20:00:44 +0000 Subject: Update. 2004-07-10 Ulrich Drepper * elf/ldconfig.c: Define PROCINFO_CLASS as static before including ldsodefs.h. * sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not already defined. * sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not already defined. * elf/rtld.c (print_statistics): Mark with noinline attribute. * sysdeps/i386/dl-machine.h (elf_machine_rel): Mark with always_inline attribute. (elf_machine_rel_relative): Likewise. * include/string.h: Add libc_hidden_proto for __strtok_r and __strsep_g. * sysdeps/generic/strsep.c: Add libc_hidden_def. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/strtok_r.S: Add alias for internal symbol. * sysdeps/i386/i686/strtok_r.S: Likewise. * sysdeps/x86_64/strtok_r.S: Likewise. 2004-07-09 Alexandre Oliva * inet/getnetgrent_r.c (internal_setnetgrent): Make it hidden instead of internal-linkage, such that we can alias to it. (internal_endnetgrent, internal_getnetgrent_r): Likewise. --- inet/getnetgrent_r.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'inet') diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c index dee90ad389..5531844d14 100644 --- a/inet/getnetgrent_r.c +++ b/inet/getnetgrent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2002,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 @@ -133,7 +133,10 @@ __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap, return status == NSS_STATUS_SUCCESS; } -static int +int internal_setnetgrent (const char *group, struct __netgrent *datap); +libc_hidden_proto (internal_setnetgrent) + +int internal_setnetgrent (const char *group, struct __netgrent *datap) { /* Free list of all netgroup names from last run. */ @@ -141,6 +144,7 @@ internal_setnetgrent (const char *group, struct __netgrent *datap) return __internal_setnetgrent_reuse (group, datap, &errno); } +libc_hidden_def (internal_setnetgrent) strong_alias (internal_setnetgrent, __internal_setnetgrent) int @@ -158,7 +162,10 @@ setnetgrent (const char *group) } -static void +void internal_endnetgrent (struct __netgrent *datap); +libc_hidden_proto (internal_endnetgrent) + +void internal_endnetgrent (struct __netgrent *datap) { service_user *old_nip; @@ -186,6 +193,7 @@ internal_endnetgrent (struct __netgrent *datap) /* Now free list of all netgroup names from last run. */ free_memory (datap); } +libc_hidden_def (internal_endnetgrent) strong_alias (internal_endnetgrent, __internal_endnetgrent) @@ -200,7 +208,12 @@ endnetgrent (void) } -static int +int internal_getnetgrent_r (char **hostp, char **userp, char **domainp, + struct __netgrent *datap, + char *buffer, size_t buflen, int *errnop); +libc_hidden_proto (internal_getnetgrent_r) + +int internal_getnetgrent_r (char **hostp, char **userp, char **domainp, struct __netgrent *datap, char *buffer, size_t buflen, int *errnop) @@ -286,6 +299,7 @@ internal_getnetgrent_r (char **hostp, char **userp, char **domainp, return status == NSS_STATUS_SUCCESS ? 1 : 0; } +libc_hidden_def (internal_getnetgrent_r) strong_alias (internal_getnetgrent_r, __internal_getnetgrent_r) /* The real entry point. */ -- cgit v1.2.3