diff options
Diffstat (limited to 'sunrpc/clnt_unix.c')
| -rw-r--r-- | sunrpc/clnt_unix.c | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index 02b14893da..5d361b3034 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -173,9 +173,8 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers, /* * pre-serialize the static part of the call msg and stash it away */ - INTUSE(xdrmem_create) (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, - XDR_ENCODE); - if (!INTUSE(xdr_callhdr) (&(ct->ct_xdrs), &call_msg)) + xdrmem_create (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, XDR_ENCODE); + if (!xdr_callhdr (&(ct->ct_xdrs), &call_msg)) { if (ct->ct_closeit) __close (*sockp); @@ -188,11 +187,11 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers, * Create a client handle which uses xdrrec for serialization * and authnone for authentication. */ - INTUSE(xdrrec_create) (&(ct->ct_xdrs), sendsz, recvsz, - (caddr_t) ct, readunix, writeunix); + xdrrec_create (&(ct->ct_xdrs), sendsz, recvsz, + (caddr_t) ct, readunix, writeunix); h->cl_ops = (struct clnt_ops *) &unix_ops; h->cl_private = (caddr_t) ct; - h->cl_auth = INTUSE(authnone_create) (); + h->cl_auth = authnone_create (); return h; fooy: @@ -203,7 +202,7 @@ fooy: mem_free ((caddr_t) h, sizeof (CLIENT)); return (CLIENT *) NULL; } -INTDEF (clntunix_create) +libc_hidden_nolink (clntunix_create, GLIBC_2_1) static enum clnt_stat clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) @@ -243,10 +242,10 @@ call_again: { if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; - (void) INTUSE(xdrrec_endofrecord) (xdrs, TRUE); + (void) xdrrec_endofrecord (xdrs, TRUE); return ct->ct_error.re_status; } - if (!INTUSE(xdrrec_endofrecord) (xdrs, shipnow)) + if (!xdrrec_endofrecord (xdrs, shipnow)) return ct->ct_error.re_status = RPC_CANTSEND; if (!shipnow) return RPC_SUCCESS; @@ -265,11 +264,11 @@ call_again: { reply_msg.acpted_rply.ar_verf = _null_auth; reply_msg.acpted_rply.ar_results.where = NULL; - reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)INTUSE(xdr_void); - if (!INTUSE(xdrrec_skiprecord) (xdrs)) + reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; + if (!xdrrec_skiprecord (xdrs)) return ct->ct_error.re_status; /* now decode and validate the response header */ - if (!INTUSE(xdr_replymsg) (xdrs, &reply_msg)) + if (!xdr_replymsg (xdrs, &reply_msg)) { if (ct->ct_error.re_status == RPC_SUCCESS) continue; @@ -299,8 +298,7 @@ call_again: if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { xdrs->x_op = XDR_FREE; - (void) INTUSE(xdr_opaque_auth) (xdrs, - &(reply_msg.acpted_rply.ar_verf)); + (void) xdr_opaque_auth (xdrs, &(reply_msg.acpted_rply.ar_verf)); } } /* end successful completion */ else @@ -549,18 +547,18 @@ readunix (char *ctptr, char *buf, int len) while (TRUE) { switch (__poll (&fd, 1, milliseconds)) - { - case 0: - ct->ct_error.re_status = RPC_TIMEDOUT; - return -1; - - case -1: - if (errno == EINTR) - continue; - ct->ct_error.re_status = RPC_CANTRECV; - ct->ct_error.re_errno = errno; - return -1; - } + { + case 0: + ct->ct_error.re_status = RPC_TIMEDOUT; + return -1; + + case -1: + if (errno == EINTR) + continue; + ct->ct_error.re_status = RPC_CANTRECV; + ct->ct_error.re_errno = errno; + return -1; + } break; } switch (len = __msgread (ct->ct_sock, buf, len)) |