diff options
Diffstat (limited to 'libc/inet')
| -rw-r--r-- | libc/inet/resolv.c | 24 | ||||
| -rw-r--r-- | libc/inet/rpc/clnt_udp.c | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/rpc_dtablesize.c | 4 | ||||
| -rw-r--r-- | libc/inet/rpc/rpc_thread.c | 24 | ||||
| -rw-r--r-- | libc/inet/rpc/ruserpass.c | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/svc.c | 10 | ||||
| -rw-r--r-- | libc/inet/rpc/svc_auth.c | 4 | ||||
| -rw-r--r-- | libc/inet/rpc/svc_run.c | 4 |
8 files changed, 37 insertions, 37 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 18d186170..ba0fd4674 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -273,10 +273,10 @@ extern int __open_nameservers(void) attribute_hidden; extern void __close_nameservers(void) attribute_hidden; extern int __dn_expand(const u_char *, const u_char *, const u_char *, char *, int); -extern int __libc_ns_name_uncompress(const u_char *, const u_char *, +extern int __ns_name_uncompress_internal(const u_char *, const u_char *, const u_char *, char *, size_t) attribute_hidden; -extern int __libc_ns_name_ntop(const u_char *, char *, size_t) attribute_hidden; -extern int __libc_ns_name_unpack(const u_char *, const u_char *, const u_char *, +extern int __ns_name_ntop_internal(const u_char *, char *, size_t) attribute_hidden; +extern int __ns_name_unpack_internal(const u_char *, const u_char *, const u_char *, u_char *, size_t) attribute_hidden; @@ -2389,7 +2389,7 @@ int gethostbyaddr_r (const void *addr, socklen_t len, int type, int __dn_expand(const u_char *msg, const u_char *eom, const u_char *src, char *dst, int dstsiz) { - int n = __libc_ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); + int n = __ns_name_uncompress_internal(msg, eom, src, dst, (size_t)dstsiz); if (n > 0 && dst[0] == '.') dst[0] = '\0'; @@ -2441,19 +2441,19 @@ static int special(int ch) * note: * Root domain returns as "." not "". */ -int attribute_hidden __libc_ns_name_uncompress(const u_char *msg, const u_char *eom, +int attribute_hidden __ns_name_uncompress_internal(const u_char *msg, const u_char *eom, const u_char *src, char *dst, size_t dstsiz) { u_char tmp[NS_MAXCDNAME]; int n; - if ((n = __libc_ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) + if ((n = __ns_name_unpack_internal(msg, eom, src, tmp, sizeof tmp)) == -1) return (-1); - if (__libc_ns_name_ntop(tmp, dst, dstsiz) == -1) + if (__ns_name_ntop_internal(tmp, dst, dstsiz) == -1) return (-1); return (n); } -strong_alias(__libc_ns_name_uncompress,__ns_name_uncompress) +strong_alias(__ns_name_uncompress_internal,__ns_name_uncompress) /* @@ -2465,7 +2465,7 @@ strong_alias(__libc_ns_name_uncompress,__ns_name_uncompress) * The root is returned as "." * All other domains are returned in non absolute form */ -int attribute_hidden __libc_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { +int attribute_hidden __ns_name_ntop_internal(const u_char *src, char *dst, size_t dstsiz) { const u_char *cp; char *dn, *eom; u_char c; @@ -2534,7 +2534,7 @@ int attribute_hidden __libc_ns_name_ntop(const u_char *src, char *dst, size_t ds *dn++ = '\0'; return (dn - dst); } -strong_alias(__libc_ns_name_ntop,__ns_name_ntop) +strong_alias(__ns_name_ntop_internal,__ns_name_ntop) /* * ns_name_unpack(msg, eom, src, dst, dstsiz) @@ -2542,7 +2542,7 @@ strong_alias(__libc_ns_name_ntop,__ns_name_ntop) * return: * -1 if it fails, or consumed octets if it succeeds. */ -int attribute_hidden __libc_ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, +int attribute_hidden __ns_name_unpack_internal(const u_char *msg, const u_char *eom, const u_char *src, u_char *dst, size_t dstsiz) { const u_char *srcp, *dstlim; @@ -2609,5 +2609,5 @@ int attribute_hidden __libc_ns_name_unpack(const u_char *msg, const u_char *eom, len = srcp - src; return (len); } -strong_alias(__libc_ns_name_unpack,__ns_name_unpack) +strong_alias(__ns_name_unpack_internal,__ns_name_unpack) #endif /* L_ns_name */ diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c index bc032f205..2b84f5b82 100644 --- a/libc/inet/rpc/clnt_udp.c +++ b/libc/inet/rpc/clnt_udp.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro"; */ /* CMSG_NXTHDR is using it */ -#define __cmsg_nxthdr __libc_cmsg_nxthdr +#define __cmsg_nxthdr __cmsg_nxthdr_internal #define authnone_create __authnone_create #define xdrmem_create __xdrmem_create diff --git a/libc/inet/rpc/rpc_dtablesize.c b/libc/inet/rpc/rpc_dtablesize.c index aa6d598ce..ede7120b3 100644 --- a/libc/inet/rpc/rpc_dtablesize.c +++ b/libc/inet/rpc/rpc_dtablesize.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro"; * expensive system call every time. */ int attribute_hidden -__libc__rpc_dtablesize (void) +_rpc_dtablesize_internal (void) { static int size; @@ -54,4 +54,4 @@ __libc__rpc_dtablesize (void) return size; } -strong_alias(__libc__rpc_dtablesize,_rpc_dtablesize) +strong_alias(_rpc_dtablesize_internal,_rpc_dtablesize) diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c index fb0e19cd9..1e42cbec6 100644 --- a/libc/inet/rpc/rpc_thread.c +++ b/libc/inet/rpc/rpc_thread.c @@ -95,7 +95,7 @@ __rpc_thread_variables (void) #undef svc_max_pollfd fd_set attribute_hidden * -__libc_rpc_thread_svc_fdset (void) +__rpc_thread_svc_fdset_internal (void) { struct rpc_thread_variables *tvp; @@ -104,7 +104,7 @@ __libc_rpc_thread_svc_fdset (void) return &svc_fdset; return &tvp->svc_fdset_s; } -strong_alias(__libc_rpc_thread_svc_fdset,__rpc_thread_svc_fdset) +strong_alias(__rpc_thread_svc_fdset_internal,__rpc_thread_svc_fdset) struct rpc_createerr * __rpc_thread_createerr (void) @@ -118,7 +118,7 @@ __rpc_thread_createerr (void) } struct pollfd attribute_hidden ** -__libc_rpc_thread_svc_pollfd (void) +__rpc_thread_svc_pollfd_internal (void) { struct rpc_thread_variables *tvp; @@ -127,10 +127,10 @@ __libc_rpc_thread_svc_pollfd (void) return &svc_pollfd; return &tvp->svc_pollfd_s; } -strong_alias(__libc_rpc_thread_svc_pollfd,__rpc_thread_svc_pollfd) +strong_alias(__rpc_thread_svc_pollfd_internal,__rpc_thread_svc_pollfd) int attribute_hidden * -__libc_rpc_thread_svc_max_pollfd (void) +__rpc_thread_svc_max_pollfd_internal (void) { struct rpc_thread_variables *tvp; @@ -139,7 +139,7 @@ __libc_rpc_thread_svc_max_pollfd (void) return &svc_max_pollfd; return &tvp->svc_max_pollfd_s; } -strong_alias(__libc_rpc_thread_svc_max_pollfd,__rpc_thread_svc_max_pollfd) +strong_alias(__rpc_thread_svc_max_pollfd_internal,__rpc_thread_svc_max_pollfd) #else #undef svc_fdset @@ -147,12 +147,12 @@ strong_alias(__libc_rpc_thread_svc_max_pollfd,__rpc_thread_svc_max_pollfd) #undef svc_pollfd #undef svc_max_pollfd -fd_set attribute_hidden * __libc_rpc_thread_svc_fdset (void) +fd_set attribute_hidden * __rpc_thread_svc_fdset_internal (void) { extern fd_set svc_fdset; return &(svc_fdset); } -strong_alias(__libc_rpc_thread_svc_fdset,__rpc_thread_svc_fdset) +strong_alias(__rpc_thread_svc_fdset_internal,__rpc_thread_svc_fdset) struct rpc_createerr * __rpc_thread_createerr (void) { @@ -160,19 +160,19 @@ struct rpc_createerr * __rpc_thread_createerr (void) return &(rpc_createerr); } -struct pollfd attribute_hidden ** __libc_rpc_thread_svc_pollfd (void) +struct pollfd attribute_hidden ** __rpc_thread_svc_pollfd_internal (void) { extern struct pollfd *svc_pollfd; return &(svc_pollfd); } -strong_alias(__libc_rpc_thread_svc_pollfd,__rpc_thread_svc_pollfd) +strong_alias(__rpc_thread_svc_pollfd_internal,__rpc_thread_svc_pollfd) -int attribute_hidden * __libc_rpc_thread_svc_max_pollfd (void) +int attribute_hidden * __rpc_thread_svc_max_pollfd_internal (void) { extern int svc_max_pollfd; return &(svc_max_pollfd); } -strong_alias(__libc_rpc_thread_svc_max_pollfd,__rpc_thread_svc_max_pollfd) +strong_alias(__rpc_thread_svc_max_pollfd_internal,__rpc_thread_svc_max_pollfd) #endif /* __UCLIBC_HAS_THREADS__ */ diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c index ca040ada2..edb5170e9 100644 --- a/libc/inet/rpc/ruserpass.c +++ b/libc/inet/rpc/ruserpass.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#define __fsetlocking __libc_fsetlocking +#define __fsetlocking __fsetlocking_internal #define getgid __getgid #define getegid __getegid diff --git a/libc/inet/rpc/svc.c b/libc/inet/rpc/svc.c index 5610277ee..b14cbd803 100644 --- a/libc/inet/rpc/svc.c +++ b/libc/inet/rpc/svc.c @@ -38,15 +38,15 @@ #define pmap_set __pmap_set -#define _authenticate __libc__authenticate -#define _rpc_dtablesize __libc__rpc_dtablesize +#define _authenticate _authenticate_internal +#define _rpc_dtablesize _rpc_dtablesize_internal /* used by svc_[max_]pollfd */ -#define __rpc_thread_svc_pollfd __libc_rpc_thread_svc_pollfd -#define __rpc_thread_svc_max_pollfd __libc_rpc_thread_svc_max_pollfd +#define __rpc_thread_svc_pollfd __rpc_thread_svc_pollfd_internal +#define __rpc_thread_svc_max_pollfd __rpc_thread_svc_max_pollfd_internal /* used by svc_fdset */ -#define __rpc_thread_svc_fdset __libc_rpc_thread_svc_fdset +#define __rpc_thread_svc_fdset __rpc_thread_svc_fdset_internal #define __FORCE_GLIBC #define _GNU_SOURCE diff --git a/libc/inet/rpc/svc_auth.c b/libc/inet/rpc/svc_auth.c index 80c4f7955..bcead0608 100644 --- a/libc/inet/rpc/svc_auth.c +++ b/libc/inet/rpc/svc_auth.c @@ -102,7 +102,7 @@ svcauthsw[] = * invalid. */ enum auth_stat attribute_hidden -__libc__authenticate (register struct svc_req *rqst, struct rpc_msg *msg) +_authenticate_internal (register struct svc_req *rqst, struct rpc_msg *msg) { register int cred_flavor; @@ -115,7 +115,7 @@ __libc__authenticate (register struct svc_req *rqst, struct rpc_msg *msg) return AUTH_REJECTEDCRED; } -strong_alias(__libc__authenticate,_authenticate) +strong_alias(_authenticate_internal,_authenticate) static enum auth_stat _svcauth_null (struct svc_req *rqst, struct rpc_msg *msg) diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c index 218bfd969..c0d3b34f0 100644 --- a/libc/inet/rpc/svc_run.c +++ b/libc/inet/rpc/svc_run.c @@ -32,8 +32,8 @@ */ /* used by svc_[max_]pollfd */ -#define __rpc_thread_svc_pollfd __libc_rpc_thread_svc_pollfd -#define __rpc_thread_svc_max_pollfd __libc_rpc_thread_svc_max_pollfd +#define __rpc_thread_svc_pollfd __rpc_thread_svc_pollfd_internal +#define __rpc_thread_svc_max_pollfd __rpc_thread_svc_max_pollfd_internal #define __FORCE_GLIBC #define _GNU_SOURCE |