mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
2002-02-25 Ulrich Drepper <drepper@redhat.com> * assert/assert-perr.c: Use INTUSE to reference functions and variables inside libc itself. Ise INTDEF and INTDEF2 to define appropriate aliases. Add prototypes for the new aliases. * assert/assert.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * include/netinet/in.h: Likewise. * include/rpc/auth.h: Likewise. * include/rpc/auth_unix.h: Likewise. * include/rpc/key_prot.h: Likewise. * include/rpc/pmap_prot.h: Likewise. * include/rpc/pmap_rmt.h: Likewise. * include/rpc/rpc_msg.h: Likewise. * include/rpc/xdr.h: Likewise. * inet/gethstbyad_r.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * inet/gethstbynm_r.c: Likewise. * inet/gethstent_r.c: Likewise. * inet/in6_addr.c: Likewise. * libio/__fpurge.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileops.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/genops.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofgets_u.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofread_u.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iogetwline.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/ioungetwc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/putc.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfiledoalloc.c: Likewise. * libio/wfileops.c: Likewise. * libio/wgenops.c: Likewise. * libio/wstrops.c: Likewise. * malloc/mtrace.c: Likewise. * misc/error.c: Likewise. * misc/syslog.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/hosts-lookup.c: Likewise. * stdio-common/getw.c * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/strfmon.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/svc_authux.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/tmpfile.c: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * libio/Makefile (routines): Remove iosprint. * libio/iosprintf.c: Removed
This commit is contained in:
@ -58,11 +58,12 @@ bool_t
|
||||
xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
|
||||
{
|
||||
|
||||
if (xdr_enum (xdrs, &(ap->oa_flavor)))
|
||||
return xdr_bytes (xdrs, &ap->oa_base,
|
||||
if (INTUSE(xdr_enum) (xdrs, &(ap->oa_flavor)))
|
||||
return INTUSE(xdr_bytes) (xdrs, &ap->oa_base,
|
||||
&ap->oa_length, MAX_AUTH_BYTES);
|
||||
return FALSE;
|
||||
}
|
||||
INTDEF(xdr_opaque_auth)
|
||||
|
||||
/*
|
||||
* XDR a DES block
|
||||
@ -70,8 +71,9 @@ xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
|
||||
bool_t
|
||||
xdr_des_block (XDR *xdrs, des_block *blkp)
|
||||
{
|
||||
return xdr_opaque (xdrs, (caddr_t) blkp, sizeof (des_block));
|
||||
return INTUSE(xdr_opaque) (xdrs, (caddr_t) blkp, sizeof (des_block));
|
||||
}
|
||||
INTDEF(xdr_des_block)
|
||||
|
||||
/* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
|
||||
|
||||
@ -82,23 +84,24 @@ 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 (!INTUSE(xdr_opaque_auth) (xdrs, &(ar->ar_verf)))
|
||||
return FALSE;
|
||||
if (!xdr_enum (xdrs, (enum_t *) & (ar->ar_stat)))
|
||||
if (!INTUSE(xdr_enum) (xdrs, (enum_t *) & (ar->ar_stat)))
|
||||
return FALSE;
|
||||
switch (ar->ar_stat)
|
||||
{
|
||||
case SUCCESS:
|
||||
return ((*(ar->ar_results.proc)) (xdrs, ar->ar_results.where));
|
||||
case PROG_MISMATCH:
|
||||
if (!xdr_u_long (xdrs, &(ar->ar_vers.low)))
|
||||
if (!INTUSE(xdr_u_long) (xdrs, &(ar->ar_vers.low)))
|
||||
return FALSE;
|
||||
return (xdr_u_long (xdrs, &(ar->ar_vers.high)));
|
||||
return (INTUSE(xdr_u_long) (xdrs, &(ar->ar_vers.high)));
|
||||
default:
|
||||
return TRUE;
|
||||
}
|
||||
return TRUE; /* TRUE => open ended set of problems */
|
||||
}
|
||||
INTDEF(xdr_accepted_reply)
|
||||
|
||||
/*
|
||||
* XDR the MSG_DENIED part of a reply message union
|
||||
@ -107,25 +110,26 @@ bool_t
|
||||
xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
|
||||
{
|
||||
/* personalized union, rather than calling xdr_union */
|
||||
if (!xdr_enum (xdrs, (enum_t *) & (rr->rj_stat)))
|
||||
if (!INTUSE(xdr_enum) (xdrs, (enum_t *) & (rr->rj_stat)))
|
||||
return FALSE;
|
||||
switch (rr->rj_stat)
|
||||
{
|
||||
case RPC_MISMATCH:
|
||||
if (!xdr_u_long (xdrs, &(rr->rj_vers.low)))
|
||||
if (!INTUSE(xdr_u_long) (xdrs, &(rr->rj_vers.low)))
|
||||
return FALSE;
|
||||
return xdr_u_long (xdrs, &(rr->rj_vers.high));
|
||||
return INTUSE(xdr_u_long) (xdrs, &(rr->rj_vers.high));
|
||||
|
||||
case AUTH_ERROR:
|
||||
return xdr_enum (xdrs, (enum_t *) & (rr->rj_why));
|
||||
return INTUSE(xdr_enum) (xdrs, (enum_t *) & (rr->rj_why));
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
INTDEF(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) INTUSE(xdr_accepted_reply)},
|
||||
{(int) MSG_DENIED, (xdrproc_t) INTUSE(xdr_rejected_reply)},
|
||||
{__dontcare__, NULL_xdrproc_t}};
|
||||
|
||||
/*
|
||||
@ -136,14 +140,15 @@ xdr_replymsg (xdrs, rmsg)
|
||||
XDR *xdrs;
|
||||
struct rpc_msg *rmsg;
|
||||
{
|
||||
if (xdr_u_long (xdrs, &(rmsg->rm_xid)) &&
|
||||
xdr_enum (xdrs, (enum_t *) & (rmsg->rm_direction)) &&
|
||||
if (INTUSE(xdr_u_long) (xdrs, &(rmsg->rm_xid)) &&
|
||||
INTUSE(xdr_enum) (xdrs, (enum_t *) & (rmsg->rm_direction)) &&
|
||||
(rmsg->rm_direction == REPLY))
|
||||
return xdr_union (xdrs, (enum_t *) & (rmsg->rm_reply.rp_stat),
|
||||
(caddr_t) & (rmsg->rm_reply.ru), reply_dscrm,
|
||||
NULL_xdrproc_t);
|
||||
return INTUSE(xdr_union) (xdrs, (enum_t *) & (rmsg->rm_reply.rp_stat),
|
||||
(caddr_t) & (rmsg->rm_reply.ru), reply_dscrm,
|
||||
NULL_xdrproc_t);
|
||||
return FALSE;
|
||||
}
|
||||
INTDEF(xdr_replymsg)
|
||||
|
||||
|
||||
/*
|
||||
@ -161,13 +166,14 @@ xdr_callhdr (xdrs, cmsg)
|
||||
cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
||||
if (
|
||||
(xdrs->x_op == XDR_ENCODE) &&
|
||||
xdr_u_long (xdrs, &(cmsg->rm_xid)) &&
|
||||
xdr_enum (xdrs, (enum_t *) & (cmsg->rm_direction)) &&
|
||||
xdr_u_long (xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
|
||||
xdr_u_long (xdrs, &(cmsg->rm_call.cb_prog)))
|
||||
return xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers));
|
||||
INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_xid)) &&
|
||||
INTUSE(xdr_enum) (xdrs, (enum_t *) & (cmsg->rm_direction)) &&
|
||||
INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
|
||||
INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_call.cb_prog)))
|
||||
return INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_call.cb_vers));
|
||||
return FALSE;
|
||||
}
|
||||
INTDEF(xdr_callhdr)
|
||||
|
||||
/* ************************** Client utility routine ************* */
|
||||
|
||||
|
Reference in New Issue
Block a user