diff options
Diffstat (limited to 'sunrpc')
-rw-r--r-- | sunrpc/clnt_raw.c | 5 | ||||
-rw-r--r-- | sunrpc/clnt_tcp.c | 9 | ||||
-rw-r--r-- | sunrpc/clnt_unix.c | 5 | ||||
-rw-r--r-- | sunrpc/pmap_prot.c | 4 | ||||
-rw-r--r-- | sunrpc/pmap_prot2.c | 4 | ||||
-rw-r--r-- | sunrpc/pmap_rmt.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_prot.c | 8 | ||||
-rw-r--r-- | sunrpc/rpcinfo.c | 37 | ||||
-rw-r--r-- | sunrpc/svc_raw.c | 4 | ||||
-rw-r--r-- | sunrpc/svc_udp.c | 27 | ||||
-rw-r--r-- | sunrpc/xdr.c | 19 | ||||
-rw-r--r-- | sunrpc/xdr_float.c | 8 | ||||
-rw-r--r-- | sunrpc/xdr_mem.c | 4 | ||||
-rw-r--r-- | sunrpc/xdr_ref.c | 6 |
14 files changed, 34 insertions, 110 deletions
diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c index 4004c6b..6653ee4 100644 --- a/sunrpc/clnt_raw.c +++ b/sunrpc/clnt_raw.c @@ -223,10 +223,7 @@ clntraw_geterr (CLIENT *cl, struct rpc_err *err) static bool_t -clntraw_freeres (cl, xdr_res, res_ptr) - CLIENT *cl; - xdrproc_t xdr_res; - caddr_t res_ptr; +clntraw_freeres (CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr) { struct clntraw_private_s *clp = clntraw_private; XDR *xdrs = &clp->xdr_stream; diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index f4ba0ef..534b310 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -332,9 +332,7 @@ call_again: } static void -clnttcp_geterr (h, errp) - CLIENT *h; - struct rpc_err *errp; +clnttcp_geterr (CLIENT *h, struct rpc_err *errp) { struct ct_data *ct = (struct ct_data *) h->cl_private; @@ -343,10 +341,7 @@ clnttcp_geterr (h, errp) } static bool_t -clnttcp_freeres (cl, xdr_res, res_ptr) - CLIENT *cl; - xdrproc_t xdr_res; - caddr_t res_ptr; +clnttcp_freeres (CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr) { struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index 32d88b9..ac3465e 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -317,10 +317,7 @@ clntunix_geterr (CLIENT *h, struct rpc_err *errp) } static bool_t -clntunix_freeres (cl, xdr_res, res_ptr) - CLIENT *cl; - xdrproc_t xdr_res; - caddr_t res_ptr; +clntunix_freeres (CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr) { struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c index 8df41dc..0919d09 100644 --- a/sunrpc/pmap_prot.c +++ b/sunrpc/pmap_prot.c @@ -38,9 +38,7 @@ bool_t -xdr_pmap (xdrs, regs) - XDR *xdrs; - struct pmap *regs; +xdr_pmap (XDR *xdrs, struct pmap *regs) { if (xdr_u_long (xdrs, ®s->pm_prog) && diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c index 57b0800..01f158d 100644 --- a/sunrpc/pmap_prot2.c +++ b/sunrpc/pmap_prot2.c @@ -76,9 +76,7 @@ * this sounds like a job for xdr_reference! */ bool_t -xdr_pmaplist (xdrs, rp) - XDR *xdrs; - struct pmaplist **rp; +xdr_pmaplist (XDR *xdrs, struct pmaplist **rp) { /* * more_elements is pre-computed in case the direction is diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c index fd8de85..c0adc5b 100644 --- a/sunrpc/pmap_rmt.c +++ b/sunrpc/pmap_rmt.c @@ -144,9 +144,7 @@ libc_hidden_nolink_sunrpc (xdr_rmtcall_args, GLIBC_2_0) * written for XDR_DECODE direction only */ bool_t -xdr_rmtcallres (xdrs, crp) - XDR *xdrs; - struct rmtcallres *crp; +xdr_rmtcallres (XDR *xdrs, struct rmtcallres *crp) { caddr_t port_ptr; diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c index dc24f36..f47c6be 100644 --- a/sunrpc/rpc_prot.c +++ b/sunrpc/rpc_prot.c @@ -130,9 +130,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) { if (xdr_u_long (xdrs, &(rmsg->rm_xid)) && xdr_enum (xdrs, (enum_t *) & (rmsg->rm_direction)) && @@ -151,9 +149,7 @@ libc_hidden_nolink_sunrpc (xdr_replymsg, GLIBC_2_0) * 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) { cmsg->rm_direction = CALL; diff --git a/sunrpc/rpcinfo.c b/sunrpc/rpcinfo.c index e490a7e..2b55eb4 100644 --- a/sunrpc/rpcinfo.c +++ b/sunrpc/rpcinfo.c @@ -201,10 +201,7 @@ main (int argc, char **argv) } static void -udpping (portnum, argc, argv) - u_short portnum; - int argc; - char **argv; +udpping (u_short portnum, int argc, char **argv) { struct timeval to; struct sockaddr_in addr; @@ -356,10 +353,7 @@ udpping (portnum, argc, argv) } static void -tcpping (portnum, argc, argv) - u_short portnum; - int argc; - char **argv; +tcpping (u_short portnum, int argc, char **argv) { struct timeval to; struct sockaddr_in addr; @@ -505,10 +499,7 @@ tcpping (portnum, argc, argv) * a good error message. */ static int -pstatus (client, prognum, vers) - register CLIENT *client; - u_long prognum; - u_long vers; +pstatus (register CLIENT *client, u_long prognum, u_long vers) { struct rpc_err rpcerr; @@ -527,9 +518,7 @@ pstatus (client, prognum, vers) } static void -pmapdump (argc, argv) - int argc; - char **argv; +pmapdump (int argc, char **argv) { struct sockaddr_in server_addr; register struct hostent *hp; @@ -624,9 +613,7 @@ reply_proc (res, who) } static void -brdcst (argc, argv) - int argc; - char **argv; +brdcst (int argc, char **argv) { enum clnt_stat rpc_stat; u_long prognum, vers; @@ -651,9 +638,7 @@ brdcst (argc, argv) } static void -deletereg (argc, argv) - int argc; - char **argv; +deletereg (int argc, char **argv) { u_long prog_num, version_num; @@ -700,8 +685,7 @@ print_version (void) } static u_long -getprognum (arg) - char *arg; +getprognum (char *arg) { register struct rpcent *rpc; register u_long prognum; @@ -725,8 +709,7 @@ getprognum (arg) } static u_long -getvers (arg) - char *arg; +getvers (char *arg) { register u_long vers; @@ -735,9 +718,7 @@ getvers (arg) } static void -get_inet_address (addr, host) - struct sockaddr_in *addr; - char *host; +get_inet_address (struct sockaddr_in *addr, char *host) { register struct hostent *hp; diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c index 7d88557..99bfdfe 100644 --- a/sunrpc/svc_raw.c +++ b/sunrpc/svc_raw.c @@ -97,9 +97,7 @@ svcraw_stat (SVCXPRT *xprt) } static bool_t -svcraw_recv (xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svcraw_recv (SVCXPRT *xprt, struct rpc_msg *msg) { struct svcraw_private_s *srp = svcraw_private; XDR *xdrs; diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index f4beea6..2097f92 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -205,8 +205,7 @@ libc_hidden_nolink_sunrpc (svcudp_bufcreate, GLIBC_2_0) #endif SVCXPRT * -svcudp_create (sock) - int sock; +svcudp_create (int sock) { return svcudp_bufcreate (sock, UDPMSGSIZE, UDPMSGSIZE); } @@ -217,17 +216,14 @@ libc_hidden_nolink_sunrpc (svcudp_create, GLIBC_2_0) #endif static enum xprt_stat -svcudp_stat (xprt) - SVCXPRT *xprt; +svcudp_stat (SVCXPRT *xprt) { return XPRT_IDLE; } static bool_t -svcudp_recv (xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svcudp_recv (SVCXPRT *xprt, struct rpc_msg *msg) { struct svcudp_data *su = su_data (xprt); XDR *xdrs = &(su->su_xdrs); @@ -329,9 +325,7 @@ again: } static bool_t -svcudp_reply (xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svcudp_reply (SVCXPRT *xprt, struct rpc_msg *msg) { struct svcudp_data *su = su_data (xprt); XDR *xdrs = &(su->su_xdrs); @@ -375,20 +369,14 @@ svcudp_reply (xprt, msg) } static bool_t -svcudp_getargs (xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - caddr_t args_ptr; +svcudp_getargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) { return (*xdr_args) (&(su_data (xprt)->su_xdrs), args_ptr); } static bool_t -svcudp_freeargs (xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - caddr_t args_ptr; +svcudp_freeargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) { XDR *xdrs = &(su_data (xprt)->su_xdrs); @@ -397,8 +385,7 @@ svcudp_freeargs (xprt, xdr_args, args_ptr) } static void -svcudp_destroy (xprt) - SVCXPRT *xprt; +svcudp_destroy (SVCXPRT *xprt) { struct svcudp_data *su = su_data (xprt); diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c index fade667..5fd6463 100644 --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -590,11 +590,7 @@ libc_hidden_nolink_sunrpc (xdr_opaque, GLIBC_2_0) * If *cpp is NULL maxsize bytes are allocated */ bool_t -xdr_bytes (xdrs, cpp, sizep, maxsize) - XDR *xdrs; - char **cpp; - u_int *sizep; - u_int maxsize; +xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize) { char *sp = *cpp; /* sp is the actual string pointer */ u_int nodesize; @@ -656,9 +652,7 @@ libc_hidden_nolink_sunrpc (xdr_bytes, GLIBC_2_0) * Implemented here due to commonality of the object. */ bool_t -xdr_netobj (xdrs, np) - XDR *xdrs; - struct netobj *np; +xdr_netobj (XDR *xdrs, struct netobj *np) { return xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ); @@ -733,10 +727,7 @@ libc_hidden_nolink_sunrpc (xdr_union, GLIBC_2_0) * of the string as specified by a protocol. */ bool_t -xdr_string (xdrs, cpp, maxsize) - XDR *xdrs; - char **cpp; - u_int maxsize; +xdr_string (XDR *xdrs, char **cpp, u_int maxsize) { char *sp = *cpp; /* sp is the actual string pointer */ /* Initialize to silence the compiler. It is not really needed because SIZE @@ -817,9 +808,7 @@ libc_hidden_nolink_sunrpc (xdr_string, GLIBC_2_0) * routines like clnt_call */ bool_t -xdr_wrapstring (xdrs, cpp) - XDR *xdrs; - char **cpp; +xdr_wrapstring (XDR *xdrs, char **cpp) { if (xdr_string (xdrs, cpp, LASTUNSIGNED)) { diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c index 78e8f3b..4ce8ae7 100644 --- a/sunrpc/xdr_float.c +++ b/sunrpc/xdr_float.c @@ -80,9 +80,7 @@ static struct sgl_limits { #endif /* vax */ bool_t -xdr_float(xdrs, fp) - XDR *xdrs; - float *fp; +xdr_float (XDR *xdrs, float *fp) { #ifdef vax struct ieee_single is; @@ -201,9 +199,7 @@ static struct dbl_limits { bool_t -xdr_double(xdrs, dp) - XDR *xdrs; - double *dp; +xdr_double (XDR *xdrs, double *dp) { #ifdef vax struct ieee_double id; diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c index ba7661a..8b98589 100644 --- a/sunrpc/xdr_mem.c +++ b/sunrpc/xdr_mem.c @@ -172,9 +172,7 @@ xdrmem_getpos (const XDR *xdrs) * xdrs modified */ static bool_t -xdrmem_setpos (xdrs, pos) - XDR *xdrs; - u_int pos; +xdrmem_setpos (XDR *xdrs, u_int pos) { caddr_t newaddr = xdrs->x_base + pos; caddr_t lastaddr = xdrs->x_private + xdrs->x_handy; diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c index 8fb4584..a7d9264 100644 --- a/sunrpc/xdr_ref.c +++ b/sunrpc/xdr_ref.c @@ -113,11 +113,7 @@ libc_hidden_nolink_sunrpc (xdr_reference, GLIBC_2_0) * */ bool_t -xdr_pointer (xdrs, objpp, obj_size, xdr_obj) - XDR *xdrs; - char **objpp; - u_int obj_size; - xdrproc_t xdr_obj; +xdr_pointer (XDR *xdrs, char **objpp, u_int obj_size, xdrproc_t xdr_obj) { bool_t more_data; |