From cb97aadebfeba7f5e8f1b85beee5ab10e88c2990 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 20 Nov 2008 22:11:44 +0000 Subject: Last portion of libc_hidden_proto removal. Appears to build fine (several .configs tried) --- include/rpc/auth.h | 4 ++++ include/rpc/auth_des.h | 1 + include/rpc/auth_unix.h | 1 + include/rpc/clnt.h | 12 ++++++++++-- include/rpc/netdb.h | 5 +++++ include/rpc/pmap_clnt.h | 3 +++ include/rpc/pmap_prot.h | 2 ++ include/rpc/pmap_rmt.h | 3 +++ include/rpc/rpc.h | 6 ++++++ include/rpc/rpc_msg.h | 3 +++ include/rpc/svc.h | 16 +++++++++++++++- include/rpc/svc_auth.h | 1 + include/rpc/xdr.h | 21 +++++++++++++++++++++ 13 files changed, 75 insertions(+), 3 deletions(-) (limited to 'include/rpc') diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 17eb59f70..15126c166 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -171,8 +171,11 @@ extern struct opaque_auth _null_auth; */ extern AUTH *authunix_create (char *__machname, __uid_t __uid, __gid_t __gid, int __len, __gid_t *__aup_gids); +libc_hidden_proto(authunix_create) extern AUTH *authunix_create_default (void); +libc_hidden_proto(authunix_create_default) extern AUTH *authnone_create (void) __THROW; +libc_hidden_proto(authnone_create) extern AUTH *authdes_create (const char *__servername, u_int __window, struct sockaddr *__syncaddr, des_block *__ckey) __THROW; @@ -218,6 +221,7 @@ extern int key_get_conv (char *, des_block *); * XDR an opaque authentication struct. */ extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *) __THROW; +libc_hidden_proto(xdr_opaque_auth) __END_DECLS diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index 12ada8404..7a6b8be8d 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -105,6 +105,7 @@ extern int getsecretkey (__const char *__name, char *__key, extern int rtime (struct sockaddr_in *__addrp, struct rpc_timeval *__timep, struct rpc_timeval *__timeout) __THROW; +libc_hidden_proto(rtime) __END_DECLS diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 424661d9c..713fcb437 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -74,6 +74,7 @@ struct authunix_parms extern bool_t xdr_authunix_parms (XDR *__xdrs, struct authunix_parms *__p) __THROW; +libc_hidden_proto(xdr_authunix_parms) /* * If a response verifier has flavor AUTH_SHORT, diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index cf271c5c1..72801e382 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -310,6 +310,7 @@ extern CLIENT *clnt_create (__const char *__host, __const u_long __prog, extern CLIENT *clnttcp_create (struct sockaddr_in *__raddr, u_long __prog, u_long __version, int *__sockp, u_int __sendsz, u_int __recvsz) __THROW; +libc_hidden_proto(clnttcp_create) /* * UDP based rpc. @@ -335,12 +336,12 @@ extern CLIENT *clnttcp_create (struct sockaddr_in *__raddr, u_long __prog, extern CLIENT *clntudp_create (struct sockaddr_in *__raddr, u_long __program, u_long __version, struct timeval __wait_resend, int *__sockp) __THROW; +libc_hidden_proto(clntudp_create) extern CLIENT *clntudp_bufcreate (struct sockaddr_in *__raddr, u_long __program, u_long __version, struct timeval __wait_resend, int *__sockp, u_int __sendsz, u_int __recvsz) __THROW; - - +libc_hidden_proto(clntudp_bufcreate) /* @@ -357,6 +358,7 @@ extern CLIENT *clntudp_bufcreate (struct sockaddr_in *__raddr, extern CLIENT *clntunix_create (struct sockaddr_un *__raddr, u_long __program, u_long __version, int *__sockp, u_int __sendsz, u_int __recvsz) __THROW; +libc_hidden_proto(clntunix_create) extern int callrpc (__const char *__host, __const u_long __prognum, @@ -364,12 +366,14 @@ extern int callrpc (__const char *__host, __const u_long __prognum, __const xdrproc_t __inproc, __const char *__in, __const xdrproc_t __outproc, char *__out) __THROW; extern int _rpc_dtablesize (void) __THROW; +libc_hidden_proto(_rpc_dtablesize) /* * Print why creation failed */ extern void clnt_pcreateerror (__const char *__msg); /* stderr */ extern char *clnt_spcreateerror(__const char *__msg) __THROW; /* string */ +libc_hidden_proto(clnt_spcreateerror) /* * Like clnt_perror(), but is more verbose in its output @@ -381,8 +385,11 @@ extern void clnt_perrno (enum clnt_stat __num); /* stderr */ */ extern void clnt_perror (CLIENT *__clnt, __const char *__msg); /* stderr */ +libc_hidden_proto(clnt_perror) extern char *clnt_sperror (CLIENT *__clnt, __const char *__msg) __THROW; /* string */ +libc_hidden_proto(clnt_sperror) + /* * If a creation fails, the following allows the user to figure out why. @@ -400,6 +407,7 @@ extern struct rpc_createerr rpc_createerr; * Copy error message to buffer. */ extern char *clnt_sperrno (enum clnt_stat __num) __THROW; /* string */ +libc_hidden_proto(clnt_sperrno) /* * get the port number on the host for the rpc program,version and proto diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h index 86717373c..e9a6565ad 100644 --- a/include/rpc/netdb.h +++ b/include/rpc/netdb.h @@ -51,10 +51,15 @@ struct rpcent }; extern void setrpcent (int __stayopen) __THROW; +libc_hidden_proto(setrpcent) extern void endrpcent (void) __THROW; +libc_hidden_proto(endrpcent) extern struct rpcent *getrpcbyname (__const char *__name) __THROW; +libc_hidden_proto(getrpcbyname) extern struct rpcent *getrpcbynumber (int __number) __THROW; +libc_hidden_proto(getrpcbynumber) extern struct rpcent *getrpcent (void) __THROW; +libc_hidden_proto(getrpcent) #if defined __USE_MISC && defined __UCLIBC_HAS_REENTRANT_RPC__ extern int getrpcbyname_r (__const char *__name, struct rpcent *__result_buf, diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index 1b1c45291..f5e825d67 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -71,8 +71,10 @@ typedef bool_t (*resultproc_t) (caddr_t resp, struct sockaddr_in *raddr); extern bool_t pmap_set (__const u_long __program, __const u_long __vers, int __protocol, u_short __port) __THROW; +libc_hidden_proto(pmap_set) extern bool_t pmap_unset (__const u_long __program, __const u_long __vers) __THROW; +libc_hidden_proto(pmap_unset) extern struct pmaplist *pmap_getmaps (struct sockaddr_in *__address) __THROW; extern enum clnt_stat pmap_rmtcall (struct sockaddr_in *__addr, __const u_long __prog, @@ -92,6 +94,7 @@ extern u_short pmap_getport (struct sockaddr_in *__address, __const u_long __program, __const u_long __version, u_int __protocol) __THROW; +libc_hidden_proto(pmap_getport) __END_DECLS diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index cd64e36de..30b26709f 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -95,6 +95,7 @@ struct pmap { }; extern bool_t xdr_pmap (XDR *__xdrs, struct pmap *__regs) __THROW; +libc_hidden_proto(xdr_pmap) struct pmaplist { struct pmap pml_map; @@ -102,6 +103,7 @@ struct pmaplist { }; extern bool_t xdr_pmaplist (XDR *__xdrs, struct pmaplist **__rp) __THROW; +libc_hidden_proto(xdr_pmaplist) __END_DECLS diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index 7a38b5f5f..59b4f6587 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -53,6 +53,8 @@ struct rmtcallargs { extern bool_t xdr_rmtcall_args (XDR *__xdrs, struct rmtcallargs *__crp) __THROW; +libc_hidden_proto(xdr_rmtcall_args) + struct rmtcallres { u_long *port_ptr; @@ -62,6 +64,7 @@ struct rmtcallres { }; extern bool_t xdr_rmtcallres (XDR *__xdrs, struct rmtcallres *__crp) __THROW; +libc_hidden_proto(xdr_rmtcallres) __END_DECLS diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index 8194ffee3..dce1c3e71 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -84,10 +84,12 @@ __BEGIN_DECLS /* Global variables, protected for multi-threaded applications. */ extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__)); +libc_hidden_proto(__rpc_thread_svc_fdset) #define svc_fdset (*__rpc_thread_svc_fdset ()) extern struct rpc_createerr *__rpc_thread_createerr (void) __attribute__ ((__const__)); +libc_hidden_proto(__rpc_thread_createerr) #define get_rpc_createerr() (*__rpc_thread_createerr ()) /* The people who "engineered" RPC should bee punished for naming the data structure and the variable the same. We cannot always define the @@ -100,13 +102,17 @@ extern struct rpc_createerr *__rpc_thread_createerr (void) extern struct pollfd **__rpc_thread_svc_pollfd (void) __attribute__ ((__const__)); +libc_hidden_proto(__rpc_thread_svc_pollfd) #define svc_pollfd (*__rpc_thread_svc_pollfd ()) extern int *__rpc_thread_svc_max_pollfd (void) __attribute__ ((__const__)); +libc_hidden_proto(__rpc_thread_svc_max_pollfd) #define svc_max_pollfd (*__rpc_thread_svc_max_pollfd ()) extern bool_t xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar); +libc_hidden_proto(xdr_accepted_reply) extern bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr); +libc_hidden_proto(xdr_rejected_reply) __END_DECLS diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index c04f03cc6..c848b39c2 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -171,6 +171,7 @@ struct rpc_msg { * struct rpc_msg *cmsg; */ extern bool_t xdr_callmsg (XDR *__xdrs, struct rpc_msg *__cmsg) __THROW; +libc_hidden_proto(xdr_callmsg) /* * XDR routine to pre-serialize the static part of a rpc message. @@ -179,6 +180,7 @@ extern bool_t xdr_callmsg (XDR *__xdrs, struct rpc_msg *__cmsg) __THROW; * struct rpc_msg *cmsg; */ extern bool_t xdr_callhdr (XDR *__xdrs, struct rpc_msg *__cmsg) __THROW; +libc_hidden_proto(xdr_callhdr) /* * XDR routine to handle a rpc reply. @@ -197,6 +199,7 @@ libc_hidden_proto(xdr_replymsg) */ extern void _seterr_reply (struct rpc_msg *__msg, struct rpc_err *__error) __THROW; +libc_hidden_proto(_seterr_reply) __END_DECLS diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 3ffca50bd..689832548 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -173,6 +173,7 @@ typedef void (*__dispatch_fn_t) (struct svc_req*, SVCXPRT*); extern bool_t svc_register (SVCXPRT *__xprt, rpcprog_t __prog, rpcvers_t __vers, __dispatch_fn_t __dispatch, rpcprot_t __protocol) __THROW; +libc_hidden_proto(svc_register) /* * Service un-registration @@ -182,6 +183,7 @@ extern bool_t svc_register (SVCXPRT *__xprt, rpcprog_t __prog, * rpcvers_t vers; */ extern void svc_unregister (rpcprog_t __prog, rpcvers_t __vers) __THROW; +libc_hidden_proto(svc_unregister) /* * Transport registration. @@ -190,6 +192,7 @@ extern void svc_unregister (rpcprog_t __prog, rpcvers_t __vers) __THROW; * SVCXPRT *xprt; */ extern void xprt_register (SVCXPRT *__xprt) __THROW; +libc_hidden_proto(xprt_register) /* * Transport un-register @@ -198,7 +201,7 @@ extern void xprt_register (SVCXPRT *__xprt) __THROW; * SVCXPRT *xprt; */ extern void xprt_unregister (SVCXPRT *__xprt) __THROW; - +libc_hidden_proto(xprt_unregister) /* * When the service routine is called, it must first check to see if it @@ -228,8 +231,10 @@ extern void xprt_unregister (SVCXPRT *__xprt) __THROW; extern bool_t svc_sendreply (SVCXPRT *xprt, xdrproc_t __xdr_results, caddr_t __xdr_location) __THROW; +libc_hidden_proto(svc_sendreply) extern void svcerr_decode (SVCXPRT *__xprt) __THROW; +libc_hidden_proto(svcerr_decode) extern void svcerr_weakauth (SVCXPRT *__xprt) __THROW; @@ -237,10 +242,13 @@ extern void svcerr_noproc (SVCXPRT *__xprt) __THROW; extern void svcerr_progvers (SVCXPRT *__xprt, rpcvers_t __low_vers, rpcvers_t __high_vers) __THROW; +libc_hidden_proto(svcerr_progvers) extern void svcerr_auth (SVCXPRT *__xprt, enum auth_stat __why) __THROW; +libc_hidden_proto(svcerr_auth) extern void svcerr_noprog (SVCXPRT *__xprt) __THROW; +libc_hidden_proto(svcerr_noprog) extern void svcerr_systemerr (SVCXPRT *__xprt) __THROW; @@ -270,9 +278,13 @@ extern fd_set svc_fdset; * also see clnt.h for protocol numbers. */ extern void svc_getreq (int __rdfds) __THROW; +libc_hidden_proto(svc_getreq) extern void svc_getreq_common (const int __fd) __THROW; +libc_hidden_proto(svc_getreq_common) extern void svc_getreqset (fd_set *__readfds) __THROW; +libc_hidden_proto(svc_getreqset) extern void svc_getreq_poll (struct pollfd *, const int) __THROW; +libc_hidden_proto(svc_getreq_poll) extern void svc_exit (void) __THROW; extern void svc_run (void) __THROW; @@ -294,8 +306,10 @@ extern SVCXPRT *svcraw_create (void) __THROW; * Udp based rpc. */ extern SVCXPRT *svcudp_create (int __sock) __THROW; +libc_hidden_proto(svcudp_create) extern SVCXPRT *svcudp_bufcreate (int __sock, u_int __sendsz, u_int __recvsz) __THROW; +libc_hidden_proto(svcudp_bufcreate) /* * Tcp based rpc. diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index 1c1a7156a..834e3c923 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -48,6 +48,7 @@ __BEGIN_DECLS */ extern enum auth_stat _authenticate (struct svc_req *__rqst, struct rpc_msg *__msg) __THROW; +libc_hidden_proto(_authenticate) __END_DECLS diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index c885cdcb9..9981e3ade 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -293,14 +293,23 @@ struct xdr_discrim * also, the XDR structure is always updated by some of these calls. */ extern bool_t xdr_void (void) __THROW; +libc_hidden_proto(xdr_void) extern bool_t xdr_short (XDR *__xdrs, short *__sp) __THROW; +libc_hidden_proto(xdr_short) extern bool_t xdr_u_short (XDR *__xdrs, u_short *__usp) __THROW; +libc_hidden_proto(xdr_u_short) extern bool_t xdr_int (XDR *__xdrs, int *__ip) __THROW; +libc_hidden_proto(xdr_int) extern bool_t xdr_u_int (XDR *__xdrs, u_int *__up) __THROW; +libc_hidden_proto(xdr_u_int) extern bool_t xdr_long (XDR *__xdrs, long *__lp) __THROW; +libc_hidden_proto(xdr_long) extern bool_t xdr_u_long (XDR *__xdrs, u_long *__ulp) __THROW; +libc_hidden_proto(xdr_u_long) extern bool_t xdr_hyper (XDR *__xdrs, quad_t *__llp) __THROW; +libc_hidden_proto(xdr_hyper) extern bool_t xdr_u_hyper (XDR *__xdrs, u_quad_t *__ullp) __THROW; +libc_hidden_proto(xdr_u_hyper) extern bool_t xdr_longlong_t (XDR *__xdrs, quad_t *__llp) __THROW; extern bool_t xdr_u_longlong_t (XDR *__xdrs, u_quad_t *__ullp) __THROW; extern bool_t xdr_int8_t (XDR *__xdrs, int8_t *__ip) __THROW; @@ -312,17 +321,24 @@ extern bool_t xdr_uint32_t (XDR *__xdrs, uint32_t *__up) __THROW; extern bool_t xdr_int64_t (XDR *__xdrs, int64_t *__ip) __THROW; extern bool_t xdr_uint64_t (XDR *__xdrs, uint64_t *__up) __THROW; extern bool_t xdr_bool (XDR *__xdrs, bool_t *__bp) __THROW; +libc_hidden_proto(xdr_bool) extern bool_t xdr_enum (XDR *__xdrs, enum_t *__ep) __THROW; +libc_hidden_proto(xdr_enum) extern bool_t xdr_array (XDR * _xdrs, caddr_t *__addrp, u_int *__sizep, u_int __maxsize, u_int __elsize, xdrproc_t __elproc) __THROW; +libc_hidden_proto(xdr_array) extern bool_t xdr_bytes (XDR *__xdrs, char **__cpp, u_int *__sizep, u_int __maxsize) __THROW; +libc_hidden_proto(xdr_bytes) extern bool_t xdr_opaque (XDR *__xdrs, caddr_t __cp, u_int __cnt) __THROW; +libc_hidden_proto(xdr_opaque) extern bool_t xdr_string (XDR *__xdrs, char **__cpp, u_int __maxsize) __THROW; +libc_hidden_proto(xdr_string) extern bool_t xdr_union (XDR *__xdrs, enum_t *__dscmp, char *__unp, __const struct xdr_discrim *__choices, xdrproc_t dfault) __THROW; +libc_hidden_proto(xdr_union) extern bool_t xdr_char (XDR *__xdrs, char *__cp) __THROW; extern bool_t xdr_u_char (XDR *__xdrs, u_char *__cp) __THROW; extern bool_t xdr_vector (XDR *__xdrs, char *__basep, u_int __nelem, @@ -331,6 +347,7 @@ extern bool_t xdr_float (XDR *__xdrs, float *__fp) __THROW; extern bool_t xdr_double (XDR *__xdrs, double *__dp) __THROW; extern bool_t xdr_reference (XDR *__xdrs, caddr_t *__xpp, u_int __size, xdrproc_t __proc) __THROW; +libc_hidden_proto(xdr_reference) extern bool_t xdr_pointer (XDR *__xdrs, char **__objpp, u_int __obj_size, xdrproc_t __xdr_obj) __THROW; extern bool_t xdr_wrapstring (XDR *__xdrs, char **__cpp) __THROW; @@ -368,15 +385,19 @@ extern void xdrrec_create (XDR *__xdrs, u_int __sendsize, u_int __recvsize, caddr_t __tcp_handle, int (*__readit) (char *, char *, int), int (*__writeit) (char *, char *, int)) __THROW; +libc_hidden_proto(xdrrec_create) /* make end of xdr record */ extern bool_t xdrrec_endofrecord (XDR *__xdrs, bool_t __sendnow) __THROW; +libc_hidden_proto(xdrrec_endofrecord) /* move to beginning of next record */ extern bool_t xdrrec_skiprecord (XDR *__xdrs) __THROW; +libc_hidden_proto(xdrrec_skiprecord) /* true if no more input */ extern bool_t xdrrec_eof (XDR *__xdrs) __THROW; +libc_hidden_proto(xdrrec_eof) /* free memory buffers for xdr */ extern void xdr_free (xdrproc_t __proc, char *__objp) __THROW; -- cgit v1.2.3