From f3b4c74b53903b32d1b852b381ae22b140b7b05b Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 26 Nov 2005 14:14:05 +0000 Subject: 100 JUMP relocs less (remaining 431) by hiding internally used ones --- libc/inet/resolv.c | 29 ++++++++++++++++------------- libc/inet/rpc/auth_none.c | 5 +++-- libc/inet/rpc/auth_unix.c | 12 +++++++----- libc/inet/rpc/clnt_raw.c | 2 ++ libc/inet/rpc/clnt_simple.c | 3 +-- libc/inet/rpc/clnt_tcp.c | 4 +++- libc/inet/rpc/clnt_udp.c | 7 ++++++- libc/inet/rpc/clnt_unix.c | 4 +++- libc/inet/rpc/create_xid.c | 3 +-- libc/inet/rpc/pmap_rmt.c | 4 +++- libc/inet/rpc/rcmd.c | 2 ++ libc/inet/rpc/rpc_dtablesize.c | 5 +++-- libc/inet/rpc/rpc_private.h | 10 +++++----- libc/inet/rpc/rpc_thread.c | 26 ++++++++++++++++---------- libc/inet/rpc/ruserpass.c | 2 ++ libc/inet/rpc/svc.c | 13 +++++++++++-- libc/inet/rpc/svc_auth.c | 5 +++-- libc/inet/rpc/svc_run.c | 4 ++++ libc/inet/socketcalls.c | 2 +- 19 files changed, 92 insertions(+), 50 deletions(-) (limited to 'libc/inet') diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 042398339..9104c2456 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -244,7 +244,7 @@ extern int __read_etc_hosts_r(FILE *fp, const char * name, int type, struct hostent * result_buf, char * buf, size_t buflen, struct hostent ** result, - int * h_errnop); + int * h_errnop) attribute_hidden; extern int __dns_lookup(const char * name, int type, int nscount, char ** nsip, unsigned char ** outpacket, struct resolv_answer * a) attribute_hidden; @@ -267,11 +267,11 @@ 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 __ns_name_uncompress(const u_char *, const u_char *, - const u_char *, char *, size_t); -extern int __ns_name_ntop(const u_char *, char *, size_t); -extern int __ns_name_unpack(const u_char *, const u_char *, const u_char *, - u_char *, size_t); +extern int __libc_ns_name_uncompress(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 *, + u_char *, size_t) attribute_hidden; #ifdef L_encodeh @@ -1427,7 +1427,7 @@ void attribute_hidden __open_etc_hosts(FILE **fp) return; } -int __read_etc_hosts_r(FILE * fp, const char * name, int type, +int attribute_hidden __read_etc_hosts_r(FILE * fp, const char * name, int type, enum etc_hosts_action action, struct hostent * result_buf, char * buf, size_t buflen, @@ -2377,7 +2377,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 = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); + int n = __libc_ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); if (n > 0 && dst[0] == '.') dst[0] = '\0'; @@ -2429,18 +2429,19 @@ static int special(int ch) * note: * Root domain returns as "." not "". */ -int __ns_name_uncompress(const u_char *msg, const u_char *eom, +int attribute_hidden __libc_ns_name_uncompress(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 = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) + if ((n = __libc_ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) return (-1); - if (ns_name_ntop(tmp, dst, dstsiz) == -1) + if (__libc_ns_name_ntop(tmp, dst, dstsiz) == -1) return (-1); return (n); } +strong_alias(__libc_ns_name_uncompress,__ns_name_uncompress) /* @@ -2452,7 +2453,7 @@ int __ns_name_uncompress(const u_char *msg, const u_char *eom, * The root is returned as "." * All other domains are returned in non absolute form */ -int __ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { +int attribute_hidden __libc_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { const u_char *cp; char *dn, *eom; u_char c; @@ -2521,6 +2522,7 @@ int __ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { *dn++ = '\0'; return (dn - dst); } +strong_alias(__libc_ns_name_ntop,__ns_name_ntop) /* * ns_name_unpack(msg, eom, src, dst, dstsiz) @@ -2528,7 +2530,7 @@ int __ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { * return: * -1 if it fails, or consumed octets if it succeeds. */ -int __ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, +int attribute_hidden __libc_ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, u_char *dst, size_t dstsiz) { const u_char *srcp, *dstlim; @@ -2595,4 +2597,5 @@ int __ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, len = srcp - src; return (len); } +strong_alias(__libc_ns_name_unpack,__ns_name_unpack) #endif /* L_ns_name */ diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c index b2683a651..e7b7aba53 100644 --- a/libc/inet/rpc/auth_none.c +++ b/libc/inet/rpc/auth_none.c @@ -69,8 +69,8 @@ struct authnone_private_s { static struct authnone_private_s *authnone_private; #endif -AUTH * -authnone_create (void) +AUTH attribute_hidden * +__authnone_create (void) { struct authnone_private_s *ap; XDR xdr_stream; @@ -98,6 +98,7 @@ authnone_create (void) } return (&ap->no_client); } +strong_alias(__authnone_create,authnone_create) /*ARGSUSED */ static bool_t diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c index 3e14ba2a5..4adb165cf 100644 --- a/libc/inet/rpc/auth_unix.c +++ b/libc/inet/rpc/auth_unix.c @@ -92,8 +92,8 @@ static bool_t marshal_new_auth (AUTH *) internal_function; * Create a unix style authenticator. * Returns an auth handle with the given stuff in it. */ -AUTH * -authunix_create (char *machname, uid_t uid, gid_t gid, int len, +AUTH attribute_hidden * +__authunix_create (char *machname, uid_t uid, gid_t gid, int len, gid_t *aup_gids) { struct authunix_parms aup; @@ -158,13 +158,14 @@ no_memory: marshal_new_auth (auth); return auth; } +strong_alias(__authunix_create,authunix_create) /* * Returns an auth handle with parameters determined by doing lots of * syscalls. */ -AUTH * -authunix_create_default (void) +AUTH attribute_hidden * +__authunix_create_default (void) { int len; char machname[MAX_MACHINE_NAME + 1]; @@ -184,8 +185,9 @@ authunix_create_default (void) /* This braindamaged Sun code forces us here to truncate the list of groups to NGRPS members since the code in authuxprot.c transforms a fixed array. Grrr. */ - return authunix_create (machname, uid, gid, MIN (NGRPS, len), gids); + return __authunix_create (machname, uid, gid, MIN (NGRPS, len), gids); } +strong_alias(__authunix_create_default,authunix_create_default) /* * authunix operations diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c index a1062109f..e21f40252 100644 --- a/libc/inet/rpc/clnt_raw.c +++ b/libc/inet/rpc/clnt_raw.c @@ -42,6 +42,8 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro"; * any interference from the kernel. */ +#define authnone_create __authnone_create + #define __FORCE_GLIBC #include #include "rpc_private.h" diff --git a/libc/inet/rpc/clnt_simple.c b/libc/inet/rpc/clnt_simple.c index b0af24a98..b9d315aef 100644 --- a/libc/inet/rpc/clnt_simple.c +++ b/libc/inet/rpc/clnt_simple.c @@ -150,8 +150,7 @@ callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum, } #ifdef __UCLIBC_HAS_THREADS__ -void -__rpc_thread_clnt_cleanup (void) +void attribute_hidden __rpc_thread_clnt_cleanup (void) { struct callrpc_private_s *rcp = RPC_THREAD_VARIABLE(callrpc_private_s); diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c index 804c45b84..6ccd1ca53 100644 --- a/libc/inet/rpc/clnt_tcp.c +++ b/libc/inet/rpc/clnt_tcp.c @@ -50,6 +50,8 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; * Now go hang yourself. */ +#define authnone_create __authnone_create + #define __FORCE_GLIBC #include @@ -65,7 +67,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; # include #endif -extern u_long _create_xid (void); +extern u_long _create_xid (void) attribute_hidden; #define MCALL_MSG_SIZE 24 diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c index 75d72ec13..bd25e4b33 100644 --- a/libc/inet/rpc/clnt_udp.c +++ b/libc/inet/rpc/clnt_udp.c @@ -37,6 +37,11 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro"; * Copyright (C) 1984, Sun Microsystems, Inc. */ +/* CMSG_NXTHDR is using it */ +#define __cmsg_nxthdr __libc_cmsg_nxthdr + +#define authnone_create __authnone_create + #define __FORCE_GLIBC #include @@ -62,7 +67,7 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro"; #endif extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *); -extern u_long _create_xid (void); +extern u_long _create_xid (void) attribute_hidden; /* * UDP bases client side rpc operations diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c index 81d8c4686..cbdd0eba8 100644 --- a/libc/inet/rpc/clnt_unix.c +++ b/libc/inet/rpc/clnt_unix.c @@ -46,6 +46,8 @@ * Now go hang yourself. */ +#define authnone_create __authnone_create + #define __FORCE_GLIBC #include @@ -62,7 +64,7 @@ # include #endif -extern u_long _create_xid (void); +extern u_long _create_xid (void) attribute_hidden; #define MCALL_MSG_SIZE 24 diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c index cbb961e4d..8a6dacad3 100644 --- a/libc/inet/rpc/create_xid.c +++ b/libc/inet/rpc/create_xid.c @@ -40,8 +40,7 @@ static pthread_mutex_t createxid_lock = PTHREAD_MUTEX_INITIALIZER; static int is_initialized; static struct drand48_data __rpc_lrand48_data; -unsigned long -_create_xid (void) +u_long attribute_hidden _create_xid (void) { unsigned long res; diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c index 0bb9dd884..04f558fe2 100644 --- a/libc/inet/rpc/pmap_rmt.c +++ b/libc/inet/rpc/pmap_rmt.c @@ -39,6 +39,8 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro"; * Copyright (C) 1984, Sun Microsystems, Inc. */ +#define authunix_create_default __authunix_create_default + #define __FORCE_GLIBC #include @@ -59,7 +61,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro"; #include #define MAX_BROADCAST_SIZE 1400 -extern u_long _create_xid (void); +extern u_long _create_xid (void) attribute_hidden; static const struct timeval timeout = {3, 0}; diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index af0e2e17a..f9f29285e 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif /* LIBC_SCCS and not lint */ +#define bcopy __bcopy + #define __FORCE_GLIBC #include diff --git a/libc/inet/rpc/rpc_dtablesize.c b/libc/inet/rpc/rpc_dtablesize.c index 8e0fa35be..b520b1b48 100644 --- a/libc/inet/rpc/rpc_dtablesize.c +++ b/libc/inet/rpc/rpc_dtablesize.c @@ -42,8 +42,8 @@ static char sccsid[] = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro"; * Cache the result of getdtablesize(), so we don't have to do an * expensive system call every time. */ -int -_rpc_dtablesize (void) +int attribute_hidden +__libc__rpc_dtablesize (void) { static int size; @@ -52,3 +52,4 @@ _rpc_dtablesize (void) return size; } +strong_alias(__libc__rpc_dtablesize,_rpc_dtablesize) diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h index 93662669c..69ee1cb53 100644 --- a/libc/inet/rpc/rpc_private.h +++ b/libc/inet/rpc/rpc_private.h @@ -2,7 +2,7 @@ #include /* Now define the internal interfaces. */ -extern unsigned long _create_xid (void); +extern u_long _create_xid (void) attribute_hidden; /* * Multi-threaded support @@ -40,10 +40,10 @@ struct rpc_thread_variables { }; extern struct rpc_thread_variables *__rpc_thread_variables(void) - __attribute__ ((const)); -extern void __rpc_thread_svc_cleanup (void); -extern void __rpc_thread_clnt_cleanup (void); -extern void __rpc_thread_key_cleanup (void); + __attribute__ ((const)) attribute_hidden; +extern void __rpc_thread_svc_cleanup (void) attribute_hidden; +extern void __rpc_thread_clnt_cleanup (void) attribute_hidden; +/*extern void __rpc_thread_key_cleanup (void) attribute_hidden;*/ extern void __rpc_thread_destroy (void); diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c index 8e3fca506..fb0e19cd9 100644 --- a/libc/inet/rpc/rpc_thread.c +++ b/libc/inet/rpc/rpc_thread.c @@ -63,7 +63,7 @@ rpc_thread_multi (void) } -struct rpc_thread_variables * +struct rpc_thread_variables attribute_hidden * __rpc_thread_variables (void) { __libc_once_define (static, once); @@ -94,8 +94,8 @@ __rpc_thread_variables (void) #undef svc_pollfd #undef svc_max_pollfd -fd_set * -__rpc_thread_svc_fdset (void) +fd_set attribute_hidden * +__libc_rpc_thread_svc_fdset (void) { struct rpc_thread_variables *tvp; @@ -104,6 +104,7 @@ __rpc_thread_svc_fdset (void) return &svc_fdset; return &tvp->svc_fdset_s; } +strong_alias(__libc_rpc_thread_svc_fdset,__rpc_thread_svc_fdset) struct rpc_createerr * __rpc_thread_createerr (void) @@ -116,8 +117,8 @@ __rpc_thread_createerr (void) return &tvp->rpc_createerr_s; } -struct pollfd ** -__rpc_thread_svc_pollfd (void) +struct pollfd attribute_hidden ** +__libc_rpc_thread_svc_pollfd (void) { struct rpc_thread_variables *tvp; @@ -126,9 +127,10 @@ __rpc_thread_svc_pollfd (void) return &svc_pollfd; return &tvp->svc_pollfd_s; } +strong_alias(__libc_rpc_thread_svc_pollfd,__rpc_thread_svc_pollfd) -int * -__rpc_thread_svc_max_pollfd (void) +int attribute_hidden * +__libc_rpc_thread_svc_max_pollfd (void) { struct rpc_thread_variables *tvp; @@ -137,6 +139,7 @@ __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) #else #undef svc_fdset @@ -144,11 +147,12 @@ __rpc_thread_svc_max_pollfd (void) #undef svc_pollfd #undef svc_max_pollfd -fd_set * __rpc_thread_svc_fdset (void) +fd_set attribute_hidden * __libc_rpc_thread_svc_fdset (void) { extern fd_set svc_fdset; return &(svc_fdset); } +strong_alias(__libc_rpc_thread_svc_fdset,__rpc_thread_svc_fdset) struct rpc_createerr * __rpc_thread_createerr (void) { @@ -156,17 +160,19 @@ struct rpc_createerr * __rpc_thread_createerr (void) return &(rpc_createerr); } -struct pollfd ** __rpc_thread_svc_pollfd (void) +struct pollfd attribute_hidden ** __libc_rpc_thread_svc_pollfd (void) { extern struct pollfd *svc_pollfd; return &(svc_pollfd); } +strong_alias(__libc_rpc_thread_svc_pollfd,__rpc_thread_svc_pollfd) -int * __rpc_thread_svc_max_pollfd (void) +int attribute_hidden * __libc_rpc_thread_svc_max_pollfd (void) { extern int svc_max_pollfd; return &(svc_max_pollfd); } +strong_alias(__libc_rpc_thread_svc_max_pollfd,__rpc_thread_svc_max_pollfd) #endif /* __UCLIBC_HAS_THREADS__ */ diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c index 5db3e567c..77a22240e 100644 --- a/libc/inet/rpc/ruserpass.c +++ b/libc/inet/rpc/ruserpass.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#define __fsetlocking __libc_fsetlocking + #define __FORCE_GLIBC #include #include diff --git a/libc/inet/rpc/svc.c b/libc/inet/rpc/svc.c index 6e1d8dc3d..08678ba79 100644 --- a/libc/inet/rpc/svc.c +++ b/libc/inet/rpc/svc.c @@ -36,6 +36,16 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ +#define _authenticate __libc__authenticate +#define _rpc_dtablesize __libc__rpc_dtablesize + +/* 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 + +/* used by svc_fdset */ +#define __rpc_thread_svc_fdset __libc_rpc_thread_svc_fdset + #define __FORCE_GLIBC #define _GNU_SOURCE #include @@ -480,8 +490,7 @@ svc_getreq_common (const int fd) #ifdef __UCLIBC_HAS_THREADS__ -void -__rpc_thread_svc_cleanup (void) +void attribute_hidden __rpc_thread_svc_cleanup (void) { struct svc_callout *svcp; diff --git a/libc/inet/rpc/svc_auth.c b/libc/inet/rpc/svc_auth.c index ebfacce04..80c4f7955 100644 --- a/libc/inet/rpc/svc_auth.c +++ b/libc/inet/rpc/svc_auth.c @@ -101,8 +101,8 @@ svcauthsw[] = * There is an assumption that any flavour less than AUTH_NULL is * invalid. */ -enum auth_stat -_authenticate (register struct svc_req *rqst, struct rpc_msg *msg) +enum auth_stat attribute_hidden +__libc__authenticate (register struct svc_req *rqst, struct rpc_msg *msg) { register int cred_flavor; @@ -115,6 +115,7 @@ _authenticate (register struct svc_req *rqst, struct rpc_msg *msg) return AUTH_REJECTEDCRED; } +strong_alias(__libc__authenticate,_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 3ef9fbd24..218bfd969 100644 --- a/libc/inet/rpc/svc_run.c +++ b/libc/inet/rpc/svc_run.c @@ -31,6 +31,10 @@ * Wait for input, call server program. */ +/* 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 __FORCE_GLIBC #define _GNU_SOURCE #include diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c index 35ab1d7a8..2215d2d99 100644 --- a/libc/inet/socketcalls.c +++ b/libc/inet/socketcalls.c @@ -5,7 +5,7 @@ #include #ifdef __NR_socketcall -extern int __socketcall(int call, unsigned long *args); +extern int __socketcall(int call, unsigned long *args) attribute_hidden; /* Various socketcall numbers */ #define SYS_SOCKET 1 -- cgit v1.2.3