From 9b0b40d35e239d33fbb66ebe88b7249f9a8f006e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 6 Aug 2002 06:09:28 +0000 Subject: [PATCH] * include/rpc/auth.h: Use libc_hidden_proto for getnetname, netname2user, host2netname, user2netname, key_gendes. * sunrpc/netname.c: Add libc_hidden_def. * sunrpc/key_call.c: Likewise. * include/netdb.h: Use libc_hidden_proto for getaddrinfo, getnameinfo, freeaddrinfo. * inet/getnameinfo.c: Add libc_hidden_def. * sysdeps/generic/getaddrinfo.c: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * include/wchar.h: Use libc_hidden_proto for wmemchr, wmemset. * wcsmbs/wmemchr.c: Add libc_hidden_def. * wcsmbs/wmemset.c: Add libc_hidden_def. * include/string.h: Move libc_hidden_proto's inside #ifndef _STRING_H. (index, rindex): Define as macros for strchr, strrchr. * string/envz.c (envz_strip): index -> strchr * include/rpc/rpc_msg.h: Use libc_hidden_proto for _seterr_reply. * sunrpc/rpc_prot.c: Add libc_hidden_def. * include/wchar.h: Use libc_hidden_proto for mbrtowc. * wcsmbs/mbrtowc.c: Add libc_hidden_weak. --- ChangeLog | 30 ++++++++++++++++++++++++++---- include/netdb.h | 4 ++++ include/rpc/auth.h | 1 + include/rpc/rpc_msg.h | 2 ++ include/string.h | 10 +++++++++- include/wchar.h | 4 ++++ inet/getnameinfo.c | 1 + string/envz.c | 2 +- sunrpc/key_call.c | 1 + sunrpc/rpc_prot.c | 1 + sysdeps/generic/getaddrinfo.c | 6 ++++-- sysdeps/posix/getaddrinfo.c | 2 ++ wcsmbs/mbrtowc.c | 1 + wcsmbs/wmemchr.c | 5 +++-- wcsmbs/wmemset.c | 3 ++- 15 files changed, 62 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffbb3f4..4e93f75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,31 @@ 2002-08-05 Roland McGrath + * include/rpc/auth.h: Use libc_hidden_proto for getnetname, + netname2user, host2netname, user2netname, key_gendes. + * sunrpc/netname.c: Add libc_hidden_def. + * sunrpc/key_call.c: Likewise. + + * include/netdb.h: Use libc_hidden_proto for getaddrinfo, getnameinfo, + freeaddrinfo. + * inet/getnameinfo.c: Add libc_hidden_def. + * sysdeps/generic/getaddrinfo.c: Likewise. + * sysdeps/posix/getaddrinfo.c: Likewise. + + * include/wchar.h: Use libc_hidden_proto for wmemchr, wmemset. + * wcsmbs/wmemchr.c: Add libc_hidden_def. + * wcsmbs/wmemset.c: Add libc_hidden_def. + + * include/string.h: Move libc_hidden_proto's inside #ifndef _STRING_H. + (index, rindex): Define as macros for strchr, strrchr. + + * string/envz.c (envz_strip): index -> strchr + + * include/rpc/rpc_msg.h: Use libc_hidden_proto for _seterr_reply. + * sunrpc/rpc_prot.c: Add libc_hidden_def. + + * include/wchar.h: Use libc_hidden_proto for mbrtowc. + * wcsmbs/mbrtowc.c: Add libc_hidden_weak. + * include/stdlib.h: Use libc_hidden_proto for wctomb. * stdlib/wctomb.c: Add libc_hidden_def. @@ -10,10 +36,6 @@ * inet/ruserpass.c: Likewise. * inet/getnetgrent_r.c: Likewise. - * include/rpc/auth.h: Use libc_hidden_proto for getnetname, - netname2user, host2netname, user2netname. - * sunrpc/netname.c: Add libc_hidden_def. - * include/rpc/svc.h: Use libc_hidden_proto for svc_register, svc_unregister, remove *_internal decls. Use libc_hidden_proto for svcerr_auth, svcerr_noprog, svcerr_progvers. diff --git a/include/netdb.h b/include/netdb.h index a824404..9b1a1ab 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -28,6 +28,10 @@ libc_hidden_proto (rexec_af) libc_hidden_proto (rresvport_af) libc_hidden_proto (ruserok_af) +libc_hidden_proto (getaddrinfo) +libc_hidden_proto (getnameinfo) +libc_hidden_proto (freeaddrinfo) + /* Document internal interfaces. */ extern int __gethostent_r (struct hostent *__restrict __result_buf, char *__restrict __buf, size_t __buflen, diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 9cef7c6..a5e290b 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -5,6 +5,7 @@ libc_hidden_proto (getnetname) libc_hidden_proto (netname2user) libc_hidden_proto (host2netname) libc_hidden_proto (user2netname) +libc_hidden_proto (key_gendes) /* Now define the internal interfaces. */ struct key_netstarg; diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index ab2e775..3e518c9 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -1,6 +1,8 @@ #ifndef _RPC_MSG_H #include +libc_hidden_proto (_seterr_reply) + /* Now define the internal interfaces. */ extern bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr); diff --git a/include/string.h b/include/string.h index 64c59b0..b4ccb1b 100644 --- a/include/string.h +++ b/include/string.h @@ -59,7 +59,6 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); __new[__len] = '\0'; \ (char *) memcpy (__new, __old, __len); \ })) -#endif libc_hidden_proto (__mempcpy) libc_hidden_proto (__stpcpy) @@ -72,3 +71,12 @@ libc_hidden_proto (__strdup) libc_hidden_proto (__strndup) libc_hidden_proto (__strerror_r) libc_hidden_proto (__strverscmp) + +# ifndef index +# define index(s, c) (strchr ((s), (c))) +# endif +# ifndef rindex +# define rindex(s, c) (strrchr ((s), (c))) +# endif + +#endif diff --git a/include/wchar.h b/include/wchar.h index 0a5c948..9094ce1 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -19,6 +19,7 @@ libc_hidden_proto (putwc_unlocked) libc_hidden_proto (vswscanf) +libc_hidden_proto (mbrtowc) libc_hidden_proto (wcrtomb) libc_hidden_proto (wcscmp) libc_hidden_proto (wcsftime) @@ -27,6 +28,9 @@ libc_hidden_proto (wcschr) libc_hidden_proto (wcscoll) libc_hidden_proto (wcspbrk) +libc_hidden_proto (wmemchr) +libc_hidden_proto (wmemset) + /* Now define the internal interfaces. */ extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) __attribute_pure__; diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 9f1a5c4..063bec4 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -421,3 +421,4 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, errno = serrno; return 0; } +libc_hidden_def (getnameinfo) diff --git a/string/envz.c b/string/envz.c index e1532ca..5c5804c 100644 --- a/string/envz.c +++ b/string/envz.c @@ -163,7 +163,7 @@ envz_strip (char **envz, size_t *envz_len) { size_t entry_len = strlen (entry) + 1; left -= entry_len; - if (! index (entry, SEP)) + if (! strchr (entry, SEP)) /* Null entry. */ memmove (entry + entry_len, entry, left); else diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index e41e3fc..0b09a5a 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -233,6 +233,7 @@ key_gendes (des_block *key) return 0; } +libc_hidden_def (key_gendes) int key_setnet (struct key_netstarg *arg) diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c index 59ec505..69b0b6c 100644 --- a/sunrpc/rpc_prot.c +++ b/sunrpc/rpc_prot.c @@ -283,3 +283,4 @@ _seterr_reply (struct rpc_msg *msg, break; } } +libc_hidden_def (_seterr_reply) diff --git a/sysdeps/generic/getaddrinfo.c b/sysdeps/generic/getaddrinfo.c index fba5fd8..548c0b8 100644 --- a/sysdeps/generic/getaddrinfo.c +++ b/sysdeps/generic/getaddrinfo.c @@ -1,5 +1,5 @@ /* Stub version of getaddrinfo function. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 2002 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 @@ -28,7 +28,7 @@ getaddrinfo (const char *name, const char *service, const struct addrinfo *req, return EAI_SYSTEM; } stub_warning (getaddrinfo) - +libc_hidden_def (getaddrinfo) void freeaddrinfo (struct addrinfo *ai) @@ -36,4 +36,6 @@ freeaddrinfo (struct addrinfo *ai) /* Nothing. */ } stub_warning (freeaddrinfo) +libc_hidden_def (freeaddrinfo) + #include diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index cdd1d88..5e09a9f 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -789,6 +789,7 @@ getaddrinfo (const char *name, const char *service, return last_i ? -(last_i & GAIH_EAI) : EAI_NONAME; } +libc_hidden_def (getaddrinfo) void freeaddrinfo (struct addrinfo *ai) @@ -802,3 +803,4 @@ freeaddrinfo (struct addrinfo *ai) free (p); } } +libc_hidden_def (freeaddrinfo) diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 521fdd7..c25ba51 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -106,3 +106,4 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) } libc_hidden_def (__mbrtowc) weak_alias (__mbrtowc, mbrtowc) +libc_hidden_weak (mbrtowc) diff --git a/wcsmbs/wmemchr.c b/wcsmbs/wmemchr.c index 5cf1834..da93e96 100644 --- a/wcsmbs/wmemchr.c +++ b/wcsmbs/wmemchr.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. + Contributed by Ulrich Drepper , 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -60,3 +60,4 @@ wmemchr (s, c, n) return NULL; } +libc_hidden_def (wmemchr) diff --git a/wcsmbs/wmemset.c b/wcsmbs/wmemset.c index 0565173..ae69f1f 100644 --- a/wcsmbs/wmemset.c +++ b/wcsmbs/wmemset.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,99,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -53,3 +53,4 @@ wmemset (s, c, n) return s; } +libc_hidden_def (wmemset) -- 2.7.4