diff options
Diffstat (limited to 'libc/inet/rpc/rpc_prot.c')
| -rw-r--r-- | libc/inet/rpc/rpc_prot.c | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c index ee6c03644..f6453950b 100644 --- a/libc/inet/rpc/rpc_prot.c +++ b/libc/inet/rpc/rpc_prot.c @@ -44,12 +44,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro"; * routines are also in this program. */ -#define xdr_bytes __xdr_bytes -#define xdr_union __xdr_union -#define xdr_enum __xdr_enum -#define xdr_opaque __xdr_opaque -#define xdr_u_long __xdr_u_long - #define __FORCE_GLIBC #include <features.h> @@ -57,14 +51,20 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro"; #include <rpc/rpc.h> +libc_hidden_proto(xdr_bytes) +libc_hidden_proto(xdr_union) +libc_hidden_proto(xdr_enum) +libc_hidden_proto(xdr_opaque) +libc_hidden_proto(xdr_u_long) + /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */ /* * XDR an opaque authentication struct * (see auth.h) */ -bool_t attribute_hidden -__xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap) +bool_t +xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap) { if (xdr_enum (xdrs, &(ap->oa_flavor))) @@ -72,7 +72,8 @@ __xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap) &ap->oa_length, MAX_AUTH_BYTES); return FALSE; } -strong_alias(__xdr_opaque_auth,xdr_opaque_auth) +libc_hidden_proto(xdr_opaque_auth) +libc_hidden_def(xdr_opaque_auth) /* * XDR a DES block @@ -92,7 +93,7 @@ bool_t xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar) { /* personalized union, rather than calling xdr_union */ - if (!__xdr_opaque_auth (xdrs, &(ar->ar_verf))) + if (!xdr_opaque_auth (xdrs, &(ar->ar_verf))) return FALSE; if (!xdr_enum (xdrs, (enum_t *) & (ar->ar_stat))) return FALSE; @@ -109,7 +110,8 @@ xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar) } return TRUE; /* TRUE => open ended set of problems */ } -hidden_strong_alias(xdr_accepted_reply,__xdr_accepted_reply) +libc_hidden_proto(xdr_accepted_reply) +libc_hidden_def(xdr_accepted_reply) /* * XDR the MSG_DENIED part of a reply message union @@ -132,19 +134,20 @@ xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr) } return FALSE; } -hidden_strong_alias(xdr_rejected_reply,__xdr_rejected_reply) +libc_hidden_proto(xdr_rejected_reply) +libc_hidden_def(xdr_rejected_reply) static const struct xdr_discrim reply_dscrm[3] = { - {(int) MSG_ACCEPTED, (xdrproc_t) __xdr_accepted_reply}, - {(int) MSG_DENIED, (xdrproc_t) __xdr_rejected_reply}, + {(int) MSG_ACCEPTED, (xdrproc_t) xdr_accepted_reply}, + {(int) MSG_DENIED, (xdrproc_t) xdr_rejected_reply}, {__dontcare__, NULL_xdrproc_t}}; /* * XDR a reply message */ -bool_t attribute_hidden -__xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg) +bool_t +xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg) { if (xdr_u_long (xdrs, &(rmsg->rm_xid)) && xdr_enum (xdrs, (enum_t *) & (rmsg->rm_direction)) && @@ -154,7 +157,8 @@ __xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg) NULL_xdrproc_t); return FALSE; } -strong_alias(__xdr_replymsg,xdr_replymsg) +libc_hidden_proto(xdr_replymsg) +libc_hidden_def(xdr_replymsg) /* @@ -162,8 +166,8 @@ strong_alias(__xdr_replymsg,xdr_replymsg) * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers. * The rm_xid is not really static, but the user can easily munge on the fly. */ -bool_t attribute_hidden -__xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg) +bool_t +xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg) { cmsg->rm_direction = CALL; @@ -177,7 +181,8 @@ __xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg) return xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers)); return FALSE; } -strong_alias(__xdr_callhdr,xdr_callhdr) +libc_hidden_proto(xdr_callhdr) +libc_hidden_def(xdr_callhdr) /* ************************** Client utility routine ************* */ @@ -242,8 +247,8 @@ rejected (enum reject_stat rjct_stat, /* * given a reply message, fills in the error */ -void attribute_hidden -__seterr_reply (struct rpc_msg *msg, +void +_seterr_reply (struct rpc_msg *msg, struct rpc_err *error) { /* optimized for normal, SUCCESSful case */ @@ -287,4 +292,5 @@ __seterr_reply (struct rpc_msg *msg, break; } } -strong_alias(__seterr_reply,_seterr_reply) +libc_hidden_proto(_seterr_reply) +libc_hidden_def(_seterr_reply) |