Libraries updates and cleanup
* Updating common/lib * Updating lib/csu * Updating lib/libc * Updating libexec/ld.elf_so * Corrected test on __minix in featuretest to actually follow the meaning of the comment. * Cleaned up _REENTRANT-related defintions. * Disabled -D_REENTRANT for libfetch * Removing some unneeded __NBSD_LIBC defines and tests Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rpc_prot.c,v 1.18 2003/05/29 18:15:25 christos Exp $ */
|
||||
/* $NetBSD: rpc_prot.c,v 1.20 2012/03/20 17:14:50 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: rpc_prot.c,v 1.18 2003/05/29 18:15:25 christos Exp $");
|
||||
__RCSID("$NetBSD: rpc_prot.c,v 1.20 2012/03/20 17:14:50 matt Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -69,8 +69,8 @@ __weak_alias(xdr_rejected_reply,_xdr_rejected_reply)
|
||||
__weak_alias(xdr_replymsg,_xdr_replymsg)
|
||||
#endif
|
||||
|
||||
static void accepted __P((enum accept_stat, struct rpc_err *));
|
||||
static void rejected __P((enum reject_stat, struct rpc_err *));
|
||||
static void accepted(enum accept_stat, struct rpc_err *);
|
||||
static void rejected(enum reject_stat, struct rpc_err *);
|
||||
|
||||
/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
|
||||
|
||||
@@ -79,9 +79,7 @@ static void rejected __P((enum reject_stat, struct rpc_err *));
|
||||
* (see auth.h)
|
||||
*/
|
||||
bool_t
|
||||
xdr_opaque_auth(xdrs, ap)
|
||||
XDR *xdrs;
|
||||
struct opaque_auth *ap;
|
||||
xdr_opaque_auth(XDR *xdrs, struct opaque_auth *ap)
|
||||
{
|
||||
|
||||
_DIAGASSERT(xdrs != NULL);
|
||||
@@ -97,15 +95,14 @@ xdr_opaque_auth(xdrs, ap)
|
||||
* XDR a DES block
|
||||
*/
|
||||
bool_t
|
||||
xdr_des_block(xdrs, blkp)
|
||||
XDR *xdrs;
|
||||
des_block *blkp;
|
||||
xdr_des_block(XDR *xdrs, des_block *blkp)
|
||||
{
|
||||
|
||||
_DIAGASSERT(xdrs != NULL);
|
||||
_DIAGASSERT(blkp != NULL);
|
||||
|
||||
return (xdr_opaque(xdrs, (caddr_t)(void *)blkp, sizeof(des_block)));
|
||||
return (xdr_opaque(xdrs, (caddr_t)(void *)blkp,
|
||||
(u_int)sizeof(des_block)));
|
||||
}
|
||||
|
||||
/* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
|
||||
@@ -114,9 +111,7 @@ xdr_des_block(xdrs, blkp)
|
||||
* XDR the MSG_ACCEPTED part of a reply message union
|
||||
*/
|
||||
bool_t
|
||||
xdr_accepted_reply(xdrs, ar)
|
||||
XDR *xdrs;
|
||||
struct accepted_reply *ar;
|
||||
xdr_accepted_reply(XDR *xdrs, struct accepted_reply *ar)
|
||||
{
|
||||
|
||||
_DIAGASSERT(xdrs != NULL);
|
||||
@@ -150,9 +145,7 @@ xdr_accepted_reply(xdrs, ar)
|
||||
* XDR the MSG_DENIED part of a reply message union
|
||||
*/
|
||||
bool_t
|
||||
xdr_rejected_reply(xdrs, rr)
|
||||
XDR *xdrs;
|
||||
struct rejected_reply *rr;
|
||||
xdr_rejected_reply(XDR *xdrs, struct rejected_reply *rr)
|
||||
{
|
||||
|
||||
_DIAGASSERT(xdrs != NULL);
|
||||
@@ -184,9 +177,7 @@ static const struct xdr_discrim reply_dscrm[3] = {
|
||||
* XDR a reply message
|
||||
*/
|
||||
bool_t
|
||||
xdr_replymsg(xdrs, rmsg)
|
||||
XDR *xdrs;
|
||||
struct rpc_msg *rmsg;
|
||||
xdr_replymsg(XDR *xdrs, struct rpc_msg *rmsg)
|
||||
{
|
||||
_DIAGASSERT(xdrs != NULL);
|
||||
_DIAGASSERT(rmsg != NULL);
|
||||
@@ -208,9 +199,7 @@ xdr_replymsg(xdrs, rmsg)
|
||||
* The rm_xid is not really static, but the user can easily munge on the fly.
|
||||
*/
|
||||
bool_t
|
||||
xdr_callhdr(xdrs, cmsg)
|
||||
XDR *xdrs;
|
||||
struct rpc_msg *cmsg;
|
||||
xdr_callhdr(XDR *xdrs, struct rpc_msg *cmsg)
|
||||
{
|
||||
|
||||
_DIAGASSERT(xdrs != NULL);
|
||||
@@ -231,9 +220,7 @@ xdr_callhdr(xdrs, cmsg)
|
||||
/* ************************** Client utility routine ************* */
|
||||
|
||||
static void
|
||||
accepted(acpt_stat, error)
|
||||
enum accept_stat acpt_stat;
|
||||
struct rpc_err *error;
|
||||
accepted(enum accept_stat acpt_stat, struct rpc_err *error)
|
||||
{
|
||||
|
||||
_DIAGASSERT(error != NULL);
|
||||
@@ -272,9 +259,7 @@ accepted(acpt_stat, error)
|
||||
}
|
||||
|
||||
static void
|
||||
rejected(rjct_stat, error)
|
||||
enum reject_stat rjct_stat;
|
||||
struct rpc_err *error;
|
||||
rejected(enum reject_stat rjct_stat, struct rpc_err *error)
|
||||
{
|
||||
|
||||
_DIAGASSERT(error != NULL);
|
||||
@@ -299,9 +284,7 @@ rejected(rjct_stat, error)
|
||||
* given a reply message, fills in the error
|
||||
*/
|
||||
void
|
||||
_seterr_reply(msg, error)
|
||||
struct rpc_msg *msg;
|
||||
struct rpc_err *error;
|
||||
_seterr_reply(struct rpc_msg *msg, struct rpc_err *error)
|
||||
{
|
||||
|
||||
_DIAGASSERT(msg != NULL);
|
||||
|
||||
Reference in New Issue
Block a user