Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

msnfs41client: Patches for libtirpc to use ISO C prototypes, 2025-09-02
Posted by Anonymous on Tue 2nd Sep 2025 13:38
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
From a686a94e604ba26f4c061d8bb5eeeb3354c13151 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 2 Sep 2025 14:10:32 +0200 Subject: [PATCH] build.vc19,libtirpc: Backport of libtirpc series to convert old-style function definitions into modern-style definitions Backport of libtirpc series to convert old-style function definitions into modern-style ANSI/ISO C function prototype definitions. Author: Steve Dickson <steved@redhat.com> Date: Sat Aug 16 15:26:36 2025 -0400 commit 4eeb59a8dbcc6b4d3db1b81a00615f6e7832a97c commit c717a52ed169701b2907ac8eb8678ca41b1533ba commit b73283a6982f83974b48d1858735649d6acf6398 commit 41cb38e2dfdc7053ebcbd777cf868f8fcbcfcf23 commit 2c9ed28d9c364c6e7c29d9b5b740893a8baea014 commit 23b0aa66a34fc6de16d285fbeb60b0fd68fa40d5 commit 791063e55d9739fa8c7c1a0d4ac1c4f8023a2843 commit d3ff4c39bbcf22e3ff736261b66a9f6c6a6bf4ca commit 2832da026b0812a23e65773b313b048c68147b09 commit 581152976f093f31957c48567278535ef54f6b3c commit 2cfe608550dbe44ac8fc6c26216f529565713fc4 commit 07e45147b877c63a1d3dd1f5ae6070543b1d93cf Convert old-style function definitions into modern-style definitions With newer compilers (gcc 15.1.1) -Wold-style-definition flag is set by default which causes warnings for most of the functions in these files. warning: old-style function definition [-Wold-style-definition] The warnings are remove by converting the old-style function definitions into modern-style definitions Reported-by: Cedric Blancher <cedric.blancher@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- build.vc19/libtirpc/libtirpc.vcxproj | 12 +- libtirpc/src/auth_time.c | 42 ++--- libtirpc/src/auth_unix.c | 35 ++-- libtirpc/src/authunix_prot.c | 4 +- libtirpc/src/bindresvport.c | 16 +- libtirpc/src/clnt_bcast.c | 67 ++++--- libtirpc/src/clnt_dg.c | 59 +++--- libtirpc/src/clnt_perror.c | 23 +-- libtirpc/src/clnt_raw.c | 46 +++-- libtirpc/src/clnt_simple.c | 19 +- libtirpc/src/clnt_vc.c | 85 +++++---- libtirpc/src/des_soft.c | 3 +- libtirpc/src/getnetconfig.c | 24 +-- libtirpc/src/getnetpath.c | 12 +- libtirpc/src/getpublickey.c | 20 +-- libtirpc/src/getrpcent.c | 13 +- libtirpc/src/getrpcport.c | 8 +- libtirpc/src/key_call.c | 58 +++--- libtirpc/src/netname.c | 19 +- libtirpc/src/netnamer.c | 33 ++-- libtirpc/src/pmap_getmaps.c | 3 +- libtirpc/src/pmap_getport.c | 20 +-- libtirpc/src/pmap_prot.c | 4 +- libtirpc/src/pmap_prot2.c | 8 +- libtirpc/src/pmap_rmt.c | 31 ++-- libtirpc/src/rpc_callmsg.c | 4 +- libtirpc/src/rpc_generic.c | 31 ++-- libtirpc/src/rpc_prot.c | 52 ++---- libtirpc/src/rpc_soc.c | 256 ++++++++++++++------------- libtirpc/src/rpcb_clnt.c | 122 ++++++------- libtirpc/src/rpcb_prot.c | 48 ++--- libtirpc/src/rpcb_st_xdr.c | 42 ++--- libtirpc/src/rpcdname.c | 3 +- libtirpc/src/rtime.c | 11 +- libtirpc/src/svc.c | 104 +++++------ libtirpc/src/svc_auth.c | 18 +- libtirpc/src/svc_auth_unix.c | 12 +- libtirpc/src/svc_dg.c | 75 ++++---- libtirpc/src/svc_generic.c | 32 ++-- libtirpc/src/svc_raw.c | 46 +++-- libtirpc/src/svc_simple.c | 19 +- libtirpc/src/svc_vc.c | 108 ++++++----- libtirpc/src/xdr.c | 224 +++++++++++------------ libtirpc/src/xdr_array.c | 26 +-- libtirpc/src/xdr_float.c | 12 +- libtirpc/src/xdr_mem.c | 74 ++++---- libtirpc/src/xdr_rec.c | 130 +++++++------- libtirpc/src/xdr_reference.c | 20 +-- libtirpc/src/xdr_sizeof.c | 6 +- libtirpc/src/xdr_stdio.c | 54 +++--- 50 files changed, 1034 insertions(+), 1159 deletions(-) diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj index 5f889fb..44d1364 100644 --- a/build.vc19/libtirpc/libtirpc.vcxproj +++ b/build.vc19/libtirpc/libtirpc.vcxproj @@ -133,7 +133,7 @@ <BasicRuntimeChecks>Default</BasicRuntimeChecks> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions> + <AdditionalOptions>/wd4100 /wd4389 /wd5105</AdditionalOptions> <SupportJustMyCode>false</SupportJustMyCode> <OmitFramePointers>false</OmitFramePointers> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -159,7 +159,7 @@ <BasicRuntimeChecks>Default</BasicRuntimeChecks> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions> + <AdditionalOptions>/wd4100 /wd4389 /wd5105</AdditionalOptions> <SupportJustMyCode>false</SupportJustMyCode> <OmitFramePointers>false</OmitFramePointers> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -185,7 +185,7 @@ <BasicRuntimeChecks>Default</BasicRuntimeChecks> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions> + <AdditionalOptions>/wd4100 /wd4389 /wd5105</AdditionalOptions> <SupportJustMyCode>false</SupportJustMyCode> <IntrinsicFunctions>true</IntrinsicFunctions> <WholeProgramOptimization>false</WholeProgramOptimization> @@ -210,7 +210,7 @@ <StringPooling>true</StringPooling> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions> + <AdditionalOptions>/wd4100 /wd4389 /wd5105</AdditionalOptions> <OmitFramePointers>false</OmitFramePointers> <IntrinsicFunctions>true</IntrinsicFunctions> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -240,7 +240,7 @@ <StringPooling>true</StringPooling> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions> + <AdditionalOptions>/wd4100 /wd4389 /wd5105</AdditionalOptions> <OmitFramePointers>false</OmitFramePointers> <IntrinsicFunctions>true</IntrinsicFunctions> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -270,7 +270,7 @@ <StringPooling>true</StringPooling> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions> + <AdditionalOptions>/wd4100 /wd4389 /wd5105</AdditionalOptions> <IntrinsicFunctions>true</IntrinsicFunctions> <WholeProgramOptimization>true</WholeProgramOptimization> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> diff --git a/libtirpc/src/auth_time.c b/libtirpc/src/auth_time.c index 1e72ed4..9eef6ef 100644 --- a/libtirpc/src/auth_time.c +++ b/libtirpc/src/auth_time.c @@ -58,8 +58,7 @@ static int saw_alarm = 0; static void -alarm_hndler(s) - int s; +alarm_hndler(int s) { saw_alarm = 1; return; @@ -80,12 +79,9 @@ alarm_hndler(s) * Turn a 'universal address' into a struct sockaddr_in. * Bletch. */ -static int uaddr_to_sockaddr(uaddr, sin) -#ifdef foo - endpoint *endpt; -#endif - char *uaddr; - struct sockaddr_in *sin; +static int uaddr_to_sockaddr( + char *uaddr, + struct sockaddr_in *sin) { unsigned char p_bytes[2]; int i; @@ -115,9 +111,9 @@ static int uaddr_to_sockaddr(uaddr, sin) * Free the strings that were strduped into the eps structure. */ static void -free_eps(eps, num) - endpoint eps[]; - int num; +free_eps( + endpoint eps[], + int num) { int i; @@ -141,12 +137,12 @@ free_eps(eps, num) * structure already populated. */ static nis_server * -get_server(sin, host, srv, eps, maxep) - struct sockaddr_in *sin; - char *host; /* name of the time host */ - nis_server *srv; /* nis_server struct to use. */ - endpoint eps[]; /* array of endpoints */ - int maxep; /* max array size */ +get_server( + struct sockaddr_in *sin, + char *host, /* name of the time host */ + nis_server *srv, /* nis_server struct to use. */ + endpoint eps[], /* array of endpoints */ + int maxep) /* max array size */ { char hname[256]; int num_ep = 0, i; @@ -226,12 +222,12 @@ get_server(sin, host, srv, eps, maxep) * td = "server" - "client" */ int -__rpc_get_time_offset(td, srv, thost, uaddr, netid) - struct timeval *td; /* Time difference */ - nis_server *srv; /* NIS Server description */ - char *thost; /* if no server, this is the timehost */ - char **uaddr; /* known universal address */ - struct sockaddr_in *netid; /* known network identifier */ +__rpc_get_time_offset( + struct timeval *td, /* Time difference */ + nis_server *srv, /* NIS Server description */ + char *thost, /* if no server, this is the timehost */ + char **uaddr, /* known universal address */ + struct sockaddr_in *netid) /* known network identifier */ { CLIENT *clnt; /* Client handle */ endpoint *ep, /* useful endpoints */ diff --git a/libtirpc/src/auth_unix.c b/libtirpc/src/auth_unix.c index 486b7f0..a1835da 100644 --- a/libtirpc/src/auth_unix.c +++ b/libtirpc/src/auth_unix.c @@ -41,10 +41,12 @@ */ /* NFSv4.1 client for Windows - * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -106,12 +108,12 @@ struct audata { * Returns an auth handle with the given stuff in it. */ AUTH * -authunix_create(machname, uid, gid, len, aup_gids) - char *machname; - uid_t uid; - gid_t gid; - int len; - gid_t *aup_gids; +authunix_create( + char *machname, + uid_t uid, + gid_t gid, + int len, + gid_t *aup_gids) { struct authunix_parms aup; char mymem[MAX_AUTH_BYTES]; @@ -233,17 +235,13 @@ authunix_create_default() /* ARGSUSED */ static void -authunix_nextverf(auth) - AUTH *auth; +authunix_nextverf(AUTH *auth) { /* no action necessary */ } static bool_t -authunix_marshal(auth, xdrs, seq) - AUTH *auth; - XDR *xdrs; - u_int *seq; +authunix_marshal(AUTH *auth, XDR *xdrs, u_int *seq) { struct audata *au; @@ -255,10 +253,7 @@ authunix_marshal(auth, xdrs, seq) } static bool_t -authunix_validate(auth, verf, seq) - AUTH *auth; - struct opaque_auth *verf; - u_int seq; +authunix_validate(AUTH *auth, struct opaque_auth *verf, u_int seq) { struct audata *au; XDR xdrs; @@ -334,8 +329,7 @@ done: } static void -authunix_destroy(auth) - AUTH *auth; +authunix_destroy(AUTH *auth) { struct audata *au; @@ -360,8 +354,7 @@ authunix_destroy(auth) * sets private data, au_marshed and au_mpos */ static void -marshal_new_auth(auth) - AUTH *auth; +marshal_new_auth(AUTH *auth) { XDR xdr_stream; XDR *xdrs = &xdr_stream; diff --git a/libtirpc/src/authunix_prot.c b/libtirpc/src/authunix_prot.c index 79decde..841102e 100644 --- a/libtirpc/src/authunix_prot.c +++ b/libtirpc/src/authunix_prot.c @@ -47,9 +47,7 @@ * XDR for unix authentication parameters. */ bool_t -xdr_authunix_parms(xdrs, p) - XDR *xdrs; - struct authunix_parms *p; +xdr_authunix_parms(XDR *xdrs, struct authunix_parms *p) { assert(xdrs != NULL); diff --git a/libtirpc/src/bindresvport.c b/libtirpc/src/bindresvport.c index 5868df8..e4418df 100644 --- a/libtirpc/src/bindresvport.c +++ b/libtirpc/src/bindresvport.c @@ -61,9 +61,9 @@ * Bind a socket to a privileged IP port */ int -bindresvport(sd, sin) - int sd; - struct sockaddr_in *sin; +bindresvport( + int sd, + struct sockaddr_in *sin) { return bindresvport_sa(sd, (struct sockaddr *)sin); } @@ -76,9 +76,7 @@ bindresvport(sd, sin) #define NPORTS (ENDPORT - STARTPORT + 1) int -bindresvport_sa(sd, sa) - int sd; - struct sockaddr *sa; +bindresvport_sa(int sd, struct sockaddr *sa) { int res, af; struct sockaddr_storage myaddr; @@ -296,9 +294,9 @@ out: * Bind a socket to a privileged IP port */ int -bindresvport_sa(sd, sa) - int sd; - struct sockaddr *sa; +bindresvport_sa( + int sd, + struct sockaddr *sa) { #ifdef IPV6_PORTRANGE int old; diff --git a/libtirpc/src/clnt_bcast.c b/libtirpc/src/clnt_bcast.c index 9d6c13d..b799a65 100644 --- a/libtirpc/src/clnt_bcast.c +++ b/libtirpc/src/clnt_bcast.c @@ -92,17 +92,16 @@ int __rpc_lowvers = 0; enum clnt_stat -rpc_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, - eachresult, nettype) - rpcprog_t prog; /* program number */ - rpcvers_t vers; /* version number */ - rpcproc_t proc; /* procedure number */ - xdrproc_t xargs; /* xdr routine for args */ - caddr_t argsp; /* pointer to args */ - xdrproc_t xresults; /* xdr routine for results */ - caddr_t resultsp; /* pointer to results */ - resultproc_t eachresult; /* call with each result obtained */ - const char *nettype; /* transport type */ +rpc_broadcast( + rpcprog_t prog, /* program number */ + rpcvers_t vers, /* version number */ + rpcproc_t proc, /* procedure number */ + xdrproc_t xargs, /* xdr routine for args */ + caddr_t argsp, /* pointer to args */ + xdrproc_t xresults, /* xdr routine for results */ + caddr_t resultsp, /* pointer to results */ + resultproc_t eachresult, /* call with each result obtained */ + const char *nettype) /* transport type */ { return 0; } @@ -262,19 +261,18 @@ __rpc_broadenable(int af, int s, struct broadif *bip) enum clnt_stat -rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, - eachresult, inittime, waittime, nettype) - rpcprog_t prog; /* program number */ - rpcvers_t vers; /* version number */ - rpcproc_t proc; /* procedure number */ - xdrproc_t xargs; /* xdr routine for args */ - caddr_t argsp; /* pointer to args */ - xdrproc_t xresults; /* xdr routine for results */ - caddr_t resultsp; /* pointer to results */ - resultproc_t eachresult; /* call with each result obtained */ - int inittime; /* how long to wait initially */ - int waittime; /* maximum time to wait */ - const char *nettype; /* transport type */ +rpc_broadcast_exp( + rpcprog_t prog, /* program number */ + rpcvers_t vers, /* version number */ + rpcproc_t proc, /* procedure number */ + xdrproc_t xargs, /* xdr routine for args */ + caddr_t argsp, /* pointer to args */ + xdrproc_t xresults, /* xdr routine for results */ + caddr_t resultsp, /* pointer to results */ + resultproc_t eachresult, /* call with each result obtained */ + int inittime, /* how long to wait initially */ + int waittime, /* maximum time to wait */ + const char *nettype) /* transport type */ { enum clnt_stat stat = RPC_SUCCESS; /* Return status */ XDR xdr_stream; /* XDR stream */ @@ -687,17 +685,16 @@ done_broad: enum clnt_stat -rpc_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, - eachresult, nettype) - rpcprog_t prog; /* program number */ - rpcvers_t vers; /* version number */ - rpcproc_t proc; /* procedure number */ - xdrproc_t xargs; /* xdr routine for args */ - caddr_t argsp; /* pointer to args */ - xdrproc_t xresults; /* xdr routine for results */ - caddr_t resultsp; /* pointer to results */ - resultproc_t eachresult; /* call with each result obtained */ - const char *nettype; /* transport type */ +rpc_broadcast( + rpcprog_t prog, /* program number */ + rpcvers_t vers, /* version number */ + rpcproc_t proc, /* procedure number */ + xdrproc_t xargs, /* xdr routine for args */ + caddr_t argsp, /* pointer to args */ + xdrproc_t xresults, /* xdr routine for results */ + caddr_t resultsp, /* pointer to results */ + resultproc_t eachresult, /* call with each result obtained */ + const char *nettype) /* transport type */ { enum clnt_stat dummy; diff --git a/libtirpc/src/clnt_dg.c b/libtirpc/src/clnt_dg.c index 2af300a..418401a 100644 --- a/libtirpc/src/clnt_dg.c +++ b/libtirpc/src/clnt_dg.c @@ -155,13 +155,13 @@ struct cu_data { * If svcaddr is NULL, returns NULL. */ CLIENT * -clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz) - int fd; /* open file descriptor */ - const struct netbuf *svcaddr; /* servers address */ - rpcprog_t program; /* program number */ - rpcvers_t version; /* version number */ - u_int sendsz; /* buffer recv size */ - u_int recvsz; /* buffer send size */ +clnt_dg_create( + int fd, /* open file descriptor */ + const struct netbuf *svcaddr, /* servers address */ + rpcprog_t program, /* program number */ + rpcvers_t version, /* version number */ + u_int sendsz, /* buffer recv size */ + u_int recvsz) /* buffer send size */ { CLIENT *cl = NULL; /* client handle */ struct cu_data *cu = NULL; /* private data */ @@ -313,14 +313,14 @@ err2: } static enum clnt_stat -clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout) - CLIENT *cl; /* client handle */ - rpcproc_t proc; /* procedure number */ - xdrproc_t xargs; /* xdr routine for args */ - void *argsp; /* pointer to args */ - xdrproc_t xresults; /* xdr routine for results */ - void *resultsp; /* pointer to results */ - struct timeval utimeout; /* seconds to wait before giving up */ +clnt_dg_call( + CLIENT *cl, /* client handle */ + rpcproc_t proc, /* procedure number */ + xdrproc_t xargs, /* xdr routine for args */ + void *argsp, /* pointer to args */ + xdrproc_t xresults, /* xdr routine for results */ + void *resultsp, /* pointer to results */ + struct timeval utimeout) /* seconds to wait before giving up */ { struct cu_data *cu = (struct cu_data *)cl->cl_private; XDR *xdrs; @@ -578,9 +578,7 @@ out: } static void -clnt_dg_geterr(cl, errp) - CLIENT *cl; - struct rpc_err *errp; +clnt_dg_geterr(CLIENT *cl, struct rpc_err *errp) { struct cu_data *cu = (struct cu_data *)cl->cl_private; @@ -588,10 +586,10 @@ clnt_dg_geterr(cl, errp) } static bool_t -clnt_dg_freeres(cl, xdr_res, res_ptr) - CLIENT *cl; - xdrproc_t xdr_res; - void *res_ptr; +clnt_dg_freeres( + CLIENT *cl, + xdrproc_t xdr_res, + void *res_ptr) { struct cu_data *cu = (struct cu_data *)cl->cl_private; XDR *xdrs = &(cu->cu_outxdrs); @@ -618,16 +616,15 @@ clnt_dg_freeres(cl, xdr_res, res_ptr) /*ARGSUSED*/ static void -clnt_dg_abort(h) - CLIENT *h; +clnt_dg_abort(CLIENT *h) { } static bool_t -clnt_dg_control(cl, request, info) - CLIENT *cl; - u_int request; - void *info; +clnt_dg_control( + CLIENT *cl, + u_int request, + void *info) { struct cu_data *cu = (struct cu_data *)cl->cl_private; struct netbuf *addr; @@ -775,8 +772,7 @@ clnt_dg_control(cl, request, info) } static void -clnt_dg_destroy(cl) - CLIENT *cl; +clnt_dg_destroy(CLIENT *cl) { struct cu_data *cu = (struct cu_data *)cl->cl_private; int cu_fd = cu->cu_fd; @@ -840,8 +836,7 @@ clnt_dg_ops() * Make sure that the time is not garbage. -1 value is allowed. */ static bool_t -time_not_ok(t) - struct timeval *t; +time_not_ok(struct timeval *t) { return (t->tv_sec < -1 || t->tv_sec > 100000000 || t->tv_usec < -1 || t->tv_usec > 1000000); diff --git a/libtirpc/src/clnt_perror.c b/libtirpc/src/clnt_perror.c index e98d7a4..9f70ab4 100644 --- a/libtirpc/src/clnt_perror.c +++ b/libtirpc/src/clnt_perror.c @@ -64,9 +64,7 @@ _buf() * Print reply error info */ char * -clnt_sperror(rpch, s) - CLIENT *rpch; - const char *s; +clnt_sperror(CLIENT *rpch, const char *s) { struct rpc_err e; char *err; @@ -178,9 +176,7 @@ clnt_sperror(rpch, s) } void -clnt_perror(rpch, s) - CLIENT *rpch; - const char *s; +clnt_perror(CLIENT *rpch, const char *s) { if (rpch == NULL || s == NULL) @@ -215,8 +211,7 @@ static const char *const rpc_errlist[] = { * This interface for use by clntrpc */ char * -clnt_sperrno(stat) - enum clnt_stat stat; +clnt_sperrno(enum clnt_stat stat) { unsigned int errnum = stat; @@ -228,16 +223,14 @@ clnt_sperrno(stat) } void -clnt_perrno(num) - enum clnt_stat num; +clnt_perrno(enum clnt_stat num) { (void) fprintf(stderr, "%s\n", clnt_sperrno(num)); } char * -clnt_spcreateerror(s) - const char *s; +clnt_spcreateerror(const char *s) { char *str, *err; size_t len, i; @@ -304,8 +297,7 @@ clnt_spcreateerror(s) } void -clnt_pcreateerror(s) - const char *s; +clnt_pcreateerror(const char *s) { if (s == NULL) @@ -326,8 +318,7 @@ static const char *const auth_errlist[] = { }; static char * -auth_errmsg(stat) - enum auth_stat stat; +auth_errmsg(enum auth_stat stat) { unsigned int errnum = stat; diff --git a/libtirpc/src/clnt_raw.c b/libtirpc/src/clnt_raw.c index d97761b..245b7cf 100644 --- a/libtirpc/src/clnt_raw.c +++ b/libtirpc/src/clnt_raw.c @@ -80,9 +80,7 @@ static struct clnt_ops *clnt_raw_ops(void); * Create a client handle for memory based rpc. */ CLIENT * -clnt_raw_create(prog, vers) - rpcprog_t prog; - rpcvers_t vers; +clnt_raw_create(rpcprog_t prog, rpcvers_t vers) { struct clntraw_private *clp; struct rpc_msg call_msg; @@ -135,14 +133,14 @@ clnt_raw_create(prog, vers) /* ARGSUSED */ static enum clnt_stat -clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout) - CLIENT *h; - rpcproc_t proc; - xdrproc_t xargs; - void *argsp; - xdrproc_t xresults; - void *resultsp; - struct timeval timeout; +clnt_raw_call( + CLIENT *h, + rpcproc_t proc, + xdrproc_t xargs, + void *argsp, + xdrproc_t xresults, + void *resultsp, + struct timeval timeout) { struct clntraw_private *clp = clntraw_private; XDR *xdrs = &clp->xdr_stream; @@ -233,19 +231,17 @@ call_again: /*ARGSUSED*/ static void -clnt_raw_geterr(cl, err) - CLIENT *cl; - struct rpc_err *err; +clnt_raw_geterr(CLIENT *cl, struct rpc_err *err) { } /* ARGSUSED */ static bool_t -clnt_raw_freeres(cl, xdr_res, res_ptr) - CLIENT *cl; - xdrproc_t xdr_res; - void *res_ptr; +clnt_raw_freeres( + CLIENT *cl, + xdrproc_t xdr_res, + void *res_ptr) { struct clntraw_private *clp = clntraw_private; XDR *xdrs = &clp->xdr_stream; @@ -264,25 +260,23 @@ clnt_raw_freeres(cl, xdr_res, res_ptr) /*ARGSUSED*/ static void -clnt_raw_abort(cl) - CLIENT *cl; +clnt_raw_abort(CLIENT *cl) { } /*ARGSUSED*/ static bool_t -clnt_raw_control(cl, ui, str) - CLIENT *cl; - u_int ui; - void *str; +clnt_raw_control( + CLIENT *cl, + u_int ui, + void *str) { return (FALSE); } /*ARGSUSED*/ static void -clnt_raw_destroy(cl) - CLIENT *cl; +clnt_raw_destroy(CLIENT *cl) { } diff --git a/libtirpc/src/clnt_simple.c b/libtirpc/src/clnt_simple.c index cd478ad..ae4f320 100644 --- a/libtirpc/src/clnt_simple.c +++ b/libtirpc/src/clnt_simple.c @@ -89,15 +89,16 @@ rpc_call_destroy(void *vp) * The total time available is 25 seconds. */ enum clnt_stat -rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype) - const char *host; /* host name */ - rpcprog_t prognum; /* program number */ - rpcvers_t versnum; /* version number */ - rpcproc_t procnum; /* procedure number */ - xdrproc_t inproc, outproc; /* in/out XDR procedures */ - const char *in; - char *out; /* recv/send data */ - const char *nettype; /* nettype */ +rpc_call( + const char *host, /* host name */ + rpcprog_t prognum, /* program number */ + rpcvers_t versnum, /* version number */ + rpcproc_t procnum, /* procedure number */ + xdrproc_t inproc, /* recv data */ + const char *in, /* recv XDR data */ + xdrproc_t outproc, /* out XDR procedures */ + char *out, /* send data */ + const char *nettype) /* nettype */ { struct rpc_call_private *rcp = (struct rpc_call_private *) 0; enum clnt_stat clnt_stat; diff --git a/libtirpc/src/clnt_vc.c b/libtirpc/src/clnt_vc.c index cafd64c..b72522c 100644 --- a/libtirpc/src/clnt_vc.c +++ b/libtirpc/src/clnt_vc.c @@ -46,10 +46,12 @@ */ /* NFSv4.1 client for Windows - * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -378,16 +380,16 @@ out: * fd should be an open socket */ CLIENT * -clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz, cb_xdr, cb_fn, cb_args) - int fd; /* open file descriptor */ - const struct netbuf *raddr; /* servers address */ - const rpcprog_t prog; /* program number */ - const rpcvers_t vers; /* version number */ - u_int sendsz; /* buffer recv size */ - u_int recvsz; /* buffer send size */ - int (*cb_xdr)(void *, void *); /* if not NULL, point to function to xdr CB args */ - int (*cb_fn)(void *, void *, void **); /* if not NULL, pointer to function to handle RPC_CALLs */ - void *cb_args; /* if not NULL, pointer to pass into cb_fn */ +clnt_vc_create( + int fd, /* open file descriptor */ + const struct netbuf *raddr, /* servers address */ + const rpcprog_t prog, /* program number */ + const rpcvers_t vers, /* version number */ + u_int sendsz, /* buffer recv size */ + u_int recvsz, /* buffer send size */ + int (*cb_xdr)(void *, void *), /* if not NULL, point to function to xdr CB args */ + int (*cb_fn)(void *, void *, void **), /* if not NULL, pointer to function to handle RPC_CALLs */ + void *cb_args) /* if not NULL, pointer to pass into cb_fn */ { CLIENT *cl; /* client handle */ struct ct_data *ct = NULL; /* client handle */ @@ -565,14 +567,14 @@ err: } static enum clnt_stat -clnt_vc_call(cl, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) - CLIENT *cl; - rpcproc_t proc; - xdrproc_t xdr_args; - void *args_ptr; - xdrproc_t xdr_results; - void *results_ptr; - struct timeval timeout; +clnt_vc_call( + CLIENT *cl, + rpcproc_t proc, + xdrproc_t xdr_args, + void *args_ptr, + xdrproc_t xdr_results, + void *results_ptr, + struct timeval timeout) { struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); @@ -766,9 +768,7 @@ out_status: } static void -clnt_vc_geterr(cl, errp) - CLIENT *cl; - struct rpc_err *errp; +clnt_vc_geterr(CLIENT *cl, struct rpc_err *errp) { struct ct_data *ct; @@ -780,10 +780,10 @@ clnt_vc_geterr(cl, errp) } static bool_t -clnt_vc_freeres(cl, xdr_res, res_ptr) - CLIENT *cl; - xdrproc_t xdr_res; - void *res_ptr; +clnt_vc_freeres( + CLIENT *cl, + xdrproc_t xdr_res, + void *res_ptr) { struct ct_data *ct; XDR *xdrs; @@ -820,16 +820,15 @@ clnt_vc_freeres(cl, xdr_res, res_ptr) /*ARGSUSED*/ static void -clnt_vc_abort(cl) - CLIENT *cl; +clnt_vc_abort(CLIENT *cl) { } static bool_t -clnt_vc_control(cl, request, info) - CLIENT *cl; - u_int request; - void *info; +clnt_vc_control( + CLIENT *cl, + u_int request, + void *info) { struct ct_data *ct; void *infop = info; @@ -956,8 +955,7 @@ clnt_vc_control(cl, request, info) static void -clnt_vc_destroy(cl) - CLIENT *cl; +clnt_vc_destroy(CLIENT *cl) { struct ct_data *ct = (struct ct_data *) cl->cl_private; int ct_fd = ct->ct_fd; @@ -1021,10 +1019,10 @@ clnt_vc_destroy(cl) * around for the rpc level. */ static int -read_vc(ctp, buf, len) - void *ctp; - void *buf; - int len; +read_vc( + void *ctp, + void *buf, + int len) { /* struct sockaddr sa; @@ -1075,10 +1073,10 @@ read_vc(ctp, buf, len) } static int -write_vc(ctp, bufp, len) - void *ctp; - void *bufp; - int len; +write_vc( + void *ctp, + void *bufp, + int len) { char *buf = bufp; struct ct_data *ct = (struct ct_data *)ctp; @@ -1128,8 +1126,7 @@ clnt_vc_ops() * Note this is different from time_not_ok in clnt_dg.c */ static bool_t -time_not_ok(t) - struct timeval *t; +time_not_ok(struct timeval *t) { return (t->tv_sec <= -1 || t->tv_sec > 100000000 || t->tv_usec <= -1 || t->tv_usec > 1000000); diff --git a/libtirpc/src/des_soft.c b/libtirpc/src/des_soft.c index e6fdf20..0e95334 100644 --- a/libtirpc/src/des_soft.c +++ b/libtirpc/src/des_soft.c @@ -53,8 +53,7 @@ static char partab[128] = { * Add odd parity to low bit of 8 byte key */ void -des_setparity(p) - char *p; +des_setparity(char *p) { int i; diff --git a/libtirpc/src/getnetconfig.c b/libtirpc/src/getnetconfig.c index 15e9de1..6e7eb42 100644 --- a/libtirpc/src/getnetconfig.c +++ b/libtirpc/src/getnetconfig.c @@ -216,8 +216,7 @@ setnetconfig() */ struct netconfig * -getnetconfig(handlep) -void *handlep; +getnetconfig(void *handlep) { struct netconfig_vars *ncp = (struct netconfig_vars *)handlep; char *stringp; /* tmp string pointer */ @@ -336,8 +335,7 @@ void *handlep; * previously). */ int -endnetconfig(handlep) -void *handlep; +endnetconfig(void *handlep) { struct netconfig_vars *nc_handlep = (struct netconfig_vars *)handlep; @@ -395,8 +393,7 @@ void *handlep; */ struct netconfig * -getnetconfigent(netid) - const char *netid; +getnetconfigent(const char *netid) { FILE *file; /* NETCONFIG db's file pointer */ char *linep; /* holds current netconfig line */ @@ -493,8 +490,7 @@ getnetconfigent(netid) */ void -freenetconfigent(netconfigp) - struct netconfig *netconfigp; +freenetconfigent(struct netconfig *netconfigp) { if (netconfigp != NULL) { free(netconfigp->nc_netid); /* holds all netconfigp's strings */ @@ -518,9 +514,9 @@ freenetconfigent(netconfigp) */ static int -parse_ncp(stringp, ncp) -char *stringp; /* string to parse */ -struct netconfig *ncp; /* where to put results */ +parse_ncp( +char *stringp, /* string to parse */ +struct netconfig *ncp) /* where to put results */ { char *tokenp; /* for processing tokens */ char *lasts; @@ -642,8 +638,7 @@ nc_sperror() * Prints a message onto standard error describing the reason for failure. */ void -nc_perror(s) - const char *s; +nc_perror(const char *s) { fprintf(stderr, "%s: %s\n", s, nc_sperror()); } @@ -652,8 +647,7 @@ nc_perror(s) * Duplicates the matched netconfig buffer. */ static struct netconfig * -dup_ncp(ncp) -struct netconfig *ncp; +dup_ncp(struct netconfig *ncp) { struct netconfig *p; char *tmp; diff --git a/libtirpc/src/getnetpath.c b/libtirpc/src/getnetpath.c index fa11be1..a548fb6 100644 --- a/libtirpc/src/getnetpath.c +++ b/libtirpc/src/getnetpath.c @@ -133,8 +133,7 @@ setnetpath() */ struct netconfig * -getnetpath(handlep) - void *handlep; +getnetpath(void *handlep) { struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep; struct netconfig *ncp = NULL; /* temp. holds a netconfig session */ @@ -190,8 +189,7 @@ getnetpath(handlep) * (e.g. if setnetpath() was not called previously. */ int -endnetpath(handlep) - void *handlep; +endnetpath(void *handlep) { struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep; struct netpath_chain *chainp, *lastp; @@ -227,9 +225,9 @@ endnetpath(handlep) */ char * -_get_next_token(npp, token) -char *npp; /* string */ -int token; /* char to parse string for */ +_get_next_token( +char *npp, /* string */ +int token) /* char to parse string for */ { char *cp; /* char pointer */ char *np; /* netpath pointer */ diff --git a/libtirpc/src/getpublickey.c b/libtirpc/src/getpublickey.c index 018eee7..e0e555a 100644 --- a/libtirpc/src/getpublickey.c +++ b/libtirpc/src/getpublickey.c @@ -59,16 +59,16 @@ int (*__getpublickey_LOCAL)(const char *, char *) = 0; * Get somebody's public key */ int -__getpublickey_real(netname, publickey) - char *netname; - char *publickey; +__getpublickey_real( + const char *netname, + char *publickey) { char lookup[3 * HEXKEYBYTES]; char *p; if (publickey == NULL) return (0); - if (!getpublicandprivatekey(netname, lookup)) + if (!getpublicandprivatekey((char *)netname, lookup)) return (0); p = strchr(lookup, ':'); if (p == NULL) { @@ -86,9 +86,9 @@ __getpublickey_real(netname, publickey) */ int -getpublicandprivatekey(key, ret) - char *key; - char *ret; +getpublicandprivatekey( + char *key, + char *ret) { char buf[1024]; /* big enough */ char *res; @@ -163,9 +163,9 @@ getpublicandprivatekey(key, ret) } } -int getpublickey(netname, publickey) - const char *netname; - char *publickey; +int getpublickey( + const char *netname, + char *publickey) { if (__getpublickey_LOCAL != NULL) return(__getpublickey_LOCAL(netname, publickey)); diff --git a/libtirpc/src/getrpcent.c b/libtirpc/src/getrpcent.c index 2e2c896..56cdcea 100644 --- a/libtirpc/src/getrpcent.c +++ b/libtirpc/src/getrpcent.c @@ -90,8 +90,7 @@ _rpcdata() #ifdef GQ struct rpcent * -getrpcbynumber(number) - int number; +getrpcbynumber(int number) { #ifdef YP int reason; @@ -136,8 +135,7 @@ no_yp: } struct rpcent * -getrpcbyname(name) - char *name; +getrpcbyname(char *name) { struct rpcent *rpc = NULL; char **rp; @@ -160,8 +158,7 @@ done: #endif /* GQ */ void -setrpcent(f) - int f; +setrpcent(int f) { struct rpcdata *d = _rpcdata(); @@ -259,9 +256,7 @@ no_yp: } static struct rpcent * -interpret(val, len) - char *val; - size_t len; +interpret(char *val, size_t len) { struct rpcdata *d = _rpcdata(); char *p; diff --git a/libtirpc/src/getrpcport.c b/libtirpc/src/getrpcport.c index 8d96a98..4c0d644 100644 --- a/libtirpc/src/getrpcport.c +++ b/libtirpc/src/getrpcport.c @@ -44,9 +44,11 @@ #include <rpc/pmap_clnt.h> int -getrpcport(host, prognum, versnum, proto) - char *host; - int prognum, versnum, proto; +getrpcport( + char *host, + int prognum, + int versnum, + int proto) { struct sockaddr_in addr; struct hostent *hp; diff --git a/libtirpc/src/key_call.c b/libtirpc/src/key_call.c index 5722cb9..456196c 100644 --- a/libtirpc/src/key_call.c +++ b/libtirpc/src/key_call.c @@ -93,8 +93,7 @@ des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0; static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *); int -key_setsecret(secretkey) - const char *secretkey; +key_setsecret(const char *secretkey) { keystatus status; @@ -136,10 +135,10 @@ key_secretkey_is_set(void) } int -key_encryptsession_pk(remotename, remotekey, deskey) - char *remotename; - netobj *remotekey; - des_block *deskey; +key_encryptsession_pk( + char *remotename, + netobj *remotekey, + des_block *deskey) { cryptkeyarg2 arg; cryptkeyres res; @@ -160,10 +159,10 @@ key_encryptsession_pk(remotename, remotekey, deskey) } int -key_decryptsession_pk(remotename, remotekey, deskey) - char *remotename; - netobj *remotekey; - des_block *deskey; +key_decryptsession_pk( + char *remotename, + netobj *remotekey, + des_block *deskey) { cryptkeyarg2 arg; cryptkeyres res; @@ -184,9 +183,9 @@ key_decryptsession_pk(remotename, remotekey, deskey) } int -key_encryptsession(remotename, deskey) - const char *remotename; - des_block *deskey; +key_encryptsession( + const char *remotename, + des_block *deskey) { cryptkeyarg arg; cryptkeyres res; @@ -206,9 +205,9 @@ key_encryptsession(remotename, deskey) } int -key_decryptsession(remotename, deskey) - const char *remotename; - des_block *deskey; +key_decryptsession( + const char *remotename, + des_block *deskey) { cryptkeyarg arg; cryptkeyres res; @@ -228,8 +227,7 @@ key_decryptsession(remotename, deskey) } int -key_gendes(key) - des_block *key; +key_gendes(des_block *key) { if (!key_call((u_long)KEY_GEN, (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_des_block, key)) { @@ -239,8 +237,7 @@ key_gendes(key) } int -key_setnet(arg) -struct key_netstarg *arg; +key_setnet(struct key_netstarg *arg) { keystatus status; @@ -259,9 +256,9 @@ struct key_netstarg *arg; int -key_get_conv(pkey, deskey) - char *pkey; - des_block *deskey; +key_get_conv( + char *pkey, + des_block *deskey) { cryptkeyres res; @@ -300,8 +297,7 @@ key_call_destroy(void *vp) * Keep the handle cached. This call may be made quite often. */ static CLIENT * -getkeyserv_handle(vers) -int vers; +getkeyserv_handle(int vers) { void *localhandle; struct netconfig *nconf; @@ -421,12 +417,12 @@ int vers; /* returns 0 on failure, 1 on success */ static int -key_call(proc, xdr_arg, arg, xdr_rslt, rslt) - u_long proc; - xdrproc_t xdr_arg; - void *arg; - xdrproc_t xdr_rslt; - void *rslt; +key_call( + u_long proc, + xdrproc_t xdr_arg, + void *arg, + xdrproc_t xdr_rslt, + void *rslt) { CLIENT *clnt; struct timeval wait_time; diff --git a/libtirpc/src/netname.c b/libtirpc/src/netname.c index d0588ab..cbf2396 100644 --- a/libtirpc/src/netname.c +++ b/libtirpc/src/netname.c @@ -75,8 +75,7 @@ static char *OPSYS = "unix"; * Figure out my fully qualified network name */ int -getnetname(name) - char name[MAXNETNAMELEN+1]; +getnetname(char *name) { #ifdef _WIN32 /* I don't understand what these underlying routines are accomplishing??? */ @@ -98,10 +97,10 @@ getnetname(name) * Convert unix cred to network-name */ int -user2netname(netname, uid, domain) - char netname[MAXNETNAMELEN + 1]; - const uid_t uid; - const char *domain; +user2netname( + char *netname, + const uid_t uid, + const char *domain) { char *dfltdom; @@ -123,10 +122,10 @@ user2netname(netname, uid, domain) * Convert host to network-name */ int -host2netname(netname, host, domain) - char netname[MAXNETNAMELEN + 1]; - const char *host; - const char *domain; +host2netname( + char *netname, + const char *host, + const char *domain) { char *dfltdom; char hostname[MAXHOSTNAMELEN+1]; diff --git a/libtirpc/src/netnamer.c b/libtirpc/src/netnamer.c index b43f634..ec5fdb7 100644 --- a/libtirpc/src/netnamer.c +++ b/libtirpc/src/netnamer.c @@ -64,12 +64,12 @@ static int _getgroups( char *, gid_t * ); * Convert network-name into unix credential */ int -netname2user(netname, uidp, gidp, gidlenp, gidlist) - char netname[MAXNETNAMELEN + 1]; - uid_t *uidp; - gid_t *gidp; - int *gidlenp; - gid_t *gidlist; +netname2user( + char *netname, + uid_t *uidp, + gid_t *gidp, + int *gidlenp, + gid_t *gidlist) { char *p; int gidlen; @@ -146,9 +146,9 @@ netname2user(netname, uidp, gidp, gidlenp, gidlist) */ static int -_getgroups(uname, groups) - char *uname; - gid_t groups[NGROUPS]; +_getgroups( + char *uname, + gid_t *groups) { gid_t ngroups = 0; struct group *grp; @@ -187,10 +187,10 @@ toomany: * Convert network-name to hostname */ int -netname2host(netname, hostname, hostlen) - char netname[MAXNETNAMELEN + 1]; - char *hostname; - int hostlen; +netname2host( + char *netname, + char *hostname, + int hostlen) { int err; char valbuf[1024]; @@ -235,9 +235,10 @@ netname2host(netname, hostname, hostlen) * reads the file /etc/netid looking for a + to optionally go to the * network information service. */ -int -getnetid(key, ret) - char *key, *ret; +static int +getnetid( + char *key, + char *ret) { char buf[1024]; /* big enough */ char *res; diff --git a/libtirpc/src/pmap_getmaps.c b/libtirpc/src/pmap_getmaps.c index 1f7d8e2..eb236d3 100644 --- a/libtirpc/src/pmap_getmaps.c +++ b/libtirpc/src/pmap_getmaps.c @@ -62,8 +62,7 @@ * Calls the pmap service remotely to do get the maps. */ struct pmaplist * -pmap_getmaps(address) - struct sockaddr_in *address; +pmap_getmaps(struct sockaddr_in *address) { struct pmaplist *head = NULL; int sock = -1; diff --git a/libtirpc/src/pmap_getport.c b/libtirpc/src/pmap_getport.c index 4d3a277..7ecd6e9 100644 --- a/libtirpc/src/pmap_getport.c +++ b/libtirpc/src/pmap_getport.c @@ -56,11 +56,11 @@ static const struct timeval tottimeout = { 60, 0 }; * Returns 0 if no map exists. */ u_short -pmap_getport(address, program, version, protocol) - struct sockaddr_in *address; - u_long program; - u_long version; - u_int protocol; +pmap_getport( + struct sockaddr_in *address, + u_long program, + u_long version, + u_int protocol) { (void)fprintf(stderr, "pmap_getport: returning default NFS port 2049\n"); return (u_short)2049; @@ -72,11 +72,11 @@ pmap_getport(address, program, version, protocol) * Returns 0 if no map exists. */ u_short -pmap_getport(address, program, version, protocol) - struct sockaddr_in *address; - u_long program; - u_long version; - u_int protocol; +pmap_getport( + struct sockaddr_in *address, + u_long program, + u_long version, + u_int protocol) { u_short port = 0; int sock = -1; diff --git a/libtirpc/src/pmap_prot.c b/libtirpc/src/pmap_prot.c index 2f5644d..992d3e5 100644 --- a/libtirpc/src/pmap_prot.c +++ b/libtirpc/src/pmap_prot.c @@ -42,9 +42,7 @@ bool_t -xdr_pmap(xdrs, regs) - XDR *xdrs; - struct pmap *regs; +xdr_pmap(XDR *xdrs, struct pmap *regs) { assert(xdrs != NULL); diff --git a/libtirpc/src/pmap_prot2.c b/libtirpc/src/pmap_prot2.c index beed4a2..e3504a7 100644 --- a/libtirpc/src/pmap_prot2.c +++ b/libtirpc/src/pmap_prot2.c @@ -80,9 +80,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 @@ -124,9 +122,7 @@ xdr_pmaplist(xdrs, rp) * functionality to xdr_pmaplist(). */ bool_t -xdr_pmaplist_ptr(xdrs, rp) - XDR *xdrs; - struct pmaplist *rp; +xdr_pmaplist_ptr(XDR *xdrs, struct pmaplist *rp) { return xdr_pmaplist(xdrs, (struct pmaplist **)(void *)rp); } diff --git a/libtirpc/src/pmap_rmt.c b/libtirpc/src/pmap_rmt.c index 89b5466..61477cc 100644 --- a/libtirpc/src/pmap_rmt.c +++ b/libtirpc/src/pmap_rmt.c @@ -70,14 +70,17 @@ static const struct timeval timeout = { 3, 0 }; * programs to do a lookup and call in one step. */ enum clnt_stat -pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, - port_ptr) - struct sockaddr_in *addr; - u_long prog, vers, proc; - xdrproc_t xdrargs, xdrres; - caddr_t argsp, resp; - struct timeval tout; - u_long *port_ptr; +pmap_rmtcall( + struct sockaddr_in *addr, + u_long prog, + u_long vers, + u_long proc, + xdrproc_t xdrargs, + caddr_t argsp, + xdrproc_t xdrres, + caddr_t resp, + struct timeval tout, + u_long *port_ptr) { int sock = -1; CLIENT *client; @@ -116,9 +119,9 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, * written for XDR_ENCODE direction only */ bool_t -xdr_rmtcall_args(xdrs, cap) - XDR *xdrs; - struct rmtcallargs *cap; +xdr_rmtcall_args( + XDR *xdrs, + struct rmtcallargs *cap) { u_int lenposition, argposition, position; @@ -150,9 +153,9 @@ xdr_rmtcall_args(xdrs, cap) * 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/libtirpc/src/rpc_callmsg.c b/libtirpc/src/rpc_callmsg.c index cf864c6..f18b606 100644 --- a/libtirpc/src/rpc_callmsg.c +++ b/libtirpc/src/rpc_callmsg.c @@ -47,9 +47,7 @@ * XDR a call message */ bool_t -xdr_callmsg(xdrs, cmsg) - XDR *xdrs; - struct rpc_msg *cmsg; +xdr_callmsg(XDR *xdrs, struct rpc_msg *cmsg) { int32_t *buf; struct opaque_auth *oa; diff --git a/libtirpc/src/rpc_generic.c b/libtirpc/src/rpc_generic.c index 03ea42c..75a5a15 100644 --- a/libtirpc/src/rpc_generic.c +++ b/libtirpc/src/rpc_generic.c @@ -139,9 +139,10 @@ __rpc_dtbsize() */ u_int /*ARGSUSED*/ -__rpc_get_t_size(af, proto, size) - int af, proto; - int size; /* Size requested */ +__rpc_get_t_size( + int af, + int proto, + int size) /* Size requested */ { int maxsize, defsize; @@ -172,8 +173,7 @@ __rpc_get_t_size(af, proto, size) * Find the appropriate address buffer size */ u_int -__rpc_get_a_size(af) - int af; +__rpc_get_a_size(int af) { switch (af) { case AF_INET: @@ -211,8 +211,7 @@ strlocase(p) * If nettype is NULL, it defaults to NETPATH. */ static int -getnettype(nettype) - const char *nettype; +getnettype(const char *nettype) { int i; @@ -235,8 +234,7 @@ getnettype(nettype) * This should be freed by calling freenetconfigent() */ struct netconfig * -__rpc_getconfip(nettype) - const char *nettype; +__rpc_getconfip(const char *nettype) { char *netid; char *netid_tcp = (char *) NULL; @@ -306,8 +304,7 @@ __rpc_getconfip(nettype) * __rpc_getconf(). */ void * -__rpc_setconf(nettype) - const char *nettype; +__rpc_setconf(const char *nettype) { struct handle *handle; @@ -351,8 +348,7 @@ __rpc_setconf(nettype) * __rpc_setconf() should have been called previously. */ struct netconfig * -__rpc_getconf(vhandle) - void *vhandle; +__rpc_getconf(void *vhandle) { struct handle *handle; struct netconfig *nconf; @@ -428,8 +424,7 @@ __rpc_getconf(vhandle) } void -__rpc_endconf(vhandle) - void * vhandle; +__rpc_endconf(void * vhandle) { struct handle *handle; @@ -450,8 +445,7 @@ __rpc_endconf(vhandle) * Returns NULL if fails, else a non-NULL pointer. */ void * -rpc_nullproc(clnt) - CLIENT *clnt; +rpc_nullproc(CLIENT *clnt) { struct timeval TIMEOUT = {25, 0}; @@ -467,8 +461,7 @@ rpc_nullproc(clnt) * one succeeds in finding the netconf for the given fd. */ struct netconfig * -__rpcgettp(fd) - int fd; +__rpcgettp(int fd) { const char *netid; struct __rpc_sockinfo si; diff --git a/libtirpc/src/rpc_prot.c b/libtirpc/src/rpc_prot.c index bfaae61..2605614 100644 --- a/libtirpc/src/rpc_prot.c +++ b/libtirpc/src/rpc_prot.c @@ -40,10 +40,12 @@ */ /* NFSv4.1 client for Windows - * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -79,9 +81,7 @@ extern struct opaque_auth _null_auth; * (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) { assert(xdrs != NULL); @@ -97,9 +97,7 @@ 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) { assert(xdrs != NULL); @@ -114,9 +112,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) { assert(xdrs != NULL); @@ -150,9 +146,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) { assert(xdrs != NULL); @@ -185,9 +179,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) { assert(xdrs != NULL); assert(rmsg != NULL); @@ -206,9 +198,7 @@ xdr_replymsg(xdrs, rmsg) * XDR a reply message in pieces, first xid and direction, then union */ bool_t -xdr_getxiddir(xdrs, rmsg) - XDR *xdrs; - struct rpc_msg *rmsg; +xdr_getxiddir(XDR *xdrs, struct rpc_msg *rmsg) { assert(xdrs != NULL); assert(rmsg != NULL); @@ -218,9 +208,7 @@ xdr_getxiddir(xdrs, rmsg) } bool_t -xdr_getreplyunion(xdrs, rmsg) - XDR *xdrs; - struct rpc_msg *rmsg; +xdr_getreplyunion(XDR *xdrs, struct rpc_msg *rmsg) { assert(xdrs != NULL); assert(rmsg != NULL); @@ -231,9 +219,7 @@ xdr_getreplyunion(xdrs, rmsg) } bool_t -xdr_getcallbody(xdrs, rmsg) - XDR *xdrs; - struct rpc_msg *rmsg; +xdr_getcallbody(XDR *xdrs, struct rpc_msg *rmsg) { assert(xdrs != NULL); assert(rmsg != NULL); @@ -254,9 +240,7 @@ xdr_getcallbody(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) { assert(xdrs != NULL); @@ -277,9 +261,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) { assert(error != NULL); @@ -318,9 +300,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) { assert(error != NULL); @@ -345,9 +325,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) { assert(msg != NULL); diff --git a/libtirpc/src/rpc_soc.c b/libtirpc/src/rpc_soc.c index 5e5302a..2eaca7e 100644 --- a/libtirpc/src/rpc_soc.c +++ b/libtirpc/src/rpc_soc.c @@ -80,14 +80,14 @@ static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *); * A common clnt create routine */ static CLIENT * -clnt_com_create(raddr, prog, vers, sockp, sendsz, recvsz, tp) - struct sockaddr_in *raddr; - rpcprog_t prog; - rpcvers_t vers; - int *sockp; - u_int sendsz; - u_int recvsz; - char *tp; +clnt_com_create( + struct sockaddr_in *raddr, + rpcprog_t prog, + rpcvers_t vers, + int *sockp, + u_int sendsz, + u_int recvsz, + char *tp) { CLIENT *cl; int madefd = FALSE; @@ -156,14 +156,14 @@ err: if (madefd == TRUE) } CLIENT * -clntudp_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz) - struct sockaddr_in *raddr; - u_long prog; - u_long vers; - struct timeval wait; - int *sockp; - u_int sendsz; - u_int recvsz; +clntudp_bufcreate( + struct sockaddr_in *raddr, + u_long prog, + u_long vers, + struct timeval wait, + int *sockp, + u_int sendsz, + u_int recvsz) { CLIENT *cl; @@ -177,24 +177,24 @@ clntudp_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz) } CLIENT * -clntudp_create(raddr, program, version, wait, sockp) - struct sockaddr_in *raddr; - u_long program; - u_long version; - struct timeval wait; - int *sockp; +clntudp_create( + struct sockaddr_in *raddr, + u_long program, + u_long version, + struct timeval wait, + int *sockp) { return clntudp_bufcreate(raddr, program, version, wait, sockp, UDPMSGSIZE, UDPMSGSIZE); } CLIENT * -clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz) - struct sockaddr_in *raddr; - u_long prog; - u_long vers; - int *sockp; - u_int sendsz; - u_int recvsz; +clnttcp_create( + struct sockaddr_in *raddr, + u_long prog, + u_long vers, + int *sockp, + u_int sendsz, + u_int recvsz) { return clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp, sendsz, recvsz, "tcp"); @@ -205,14 +205,14 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz) #ifdef INET6_NOT_USED CLIENT * -clntudp6_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz) - struct sockaddr_in6 *raddr; - u_long prog; - u_long vers; - struct timeval wait; - int *sockp; - u_int sendsz; - u_int recvsz; +clntudp6_bufcreate( + struct sockaddr_in6 *raddr, + u_long prog, + u_long vers, + struct timeval wait, + int *sockp, + u_int sendsz, + u_int recvsz) { CLIENT *cl; @@ -226,24 +226,24 @@ clntudp6_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz) } CLIENT * -clntudp6_create(raddr, program, version, wait, sockp) - struct sockaddr_in6 *raddr; - u_long program; - u_long version; - struct timeval wait; - int *sockp; +clntudp6_create( + struct sockaddr_in6 *raddr, + u_long program, + u_long version, + struct timeval wait, + int *sockp) { return clntudp6_bufcreate(raddr, program, version, wait, sockp, UDPMSGSIZE, UDPMSGSIZE); } CLIENT * -clnttcp6_create(raddr, prog, vers, sockp, sendsz, recvsz) - struct sockaddr_in6 *raddr; - u_long prog; - u_long vers; - int *sockp; - u_int sendsz; - u_int recvsz; +clnttcp6_create( + struct sockaddr_in6 *raddr, + u_long prog, + u_long vers, + int *sockp, + u_int sendsz, + u_int recvsz) { return clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp, sendsz, recvsz, "tcp6"); @@ -252,9 +252,9 @@ clnttcp6_create(raddr, prog, vers, sockp, sendsz, recvsz) #endif CLIENT * -clntraw_create(prog, vers) - u_long prog; - u_long vers; +clntraw_create( + u_long prog, + u_long vers) { return clnt_raw_create((rpcprog_t)prog, (rpcvers_t)vers); } @@ -263,11 +263,11 @@ clntraw_create(prog, vers) * A common server create routine */ static SVCXPRT * -svc_com_create(fd, sendsize, recvsize, netid) - int fd; - u_int sendsize; - u_int recvsize; - char *netid; +svc_com_create( + int fd, + u_int sendsize, + u_int recvsize, + char *netid) { struct netconfig *nconf; SVCXPRT *svc; @@ -307,10 +307,10 @@ svc_com_create(fd, sendsize, recvsize, netid) } SVCXPRT * -svctcp_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svctcp_create( + int fd, + u_int sendsize, + u_int recvsize) { return svc_com_create(fd, sendsize, recvsize, "tcp"); @@ -319,9 +319,10 @@ svctcp_create(fd, sendsize, recvsize) SVCXPRT * -svcudp_bufcreate(fd, sendsz, recvsz) - int fd; - u_int sendsz, recvsz; +svcudp_bufcreate( + int fd, + u_int sendsz, + u_int recvsz) { return svc_com_create(fd, sendsz, recvsz, "udp"); @@ -330,10 +331,10 @@ svcudp_bufcreate(fd, sendsz, recvsz) SVCXPRT * -svcfd_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svcfd_create( + int fd, + u_int sendsize, + u_int recvsize) { return svc_fd_create(fd, sendsize, recvsize); @@ -341,8 +342,7 @@ svcfd_create(fd, sendsize, recvsize) SVCXPRT * -svcudp_create(fd) - int fd; +svcudp_create(int fd) { return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp"); @@ -360,35 +360,34 @@ svcraw_create() /* IPV6 version */ #ifdef INET6_NOT_USED SVCXPRT * -svcudp6_bufcreate(fd, sendsz, recvsz) - int fd; - u_int sendsz, recvsz; +svcudp6_bufcreate( + int fd, + u_int sendsz, + u_int recvsz) { return svc_com_create(fd, sendsz, recvsz, "udp6"); } SVCXPRT * -svctcp6_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svctcp6_create( + int fd, + u_int sendsize, + u_int recvsize) { return svc_com_create(fd, sendsize, recvsize, "tcp6"); } SVCXPRT * -svcudp6_create(fd) - int fd; +svcudp6_create(int fd) { return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp6"); } #endif int -get_myaddress(addr) - struct sockaddr_in *addr; +get_myaddress(struct sockaddr_in *addr) { memset((void *) addr, 0, sizeof(*addr)); @@ -402,11 +401,15 @@ get_myaddress(addr) * For connectionless "udp" transport. Obsoleted by rpc_call(). */ int -callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out) - const char *host; - int prognum, versnum, procnum; - xdrproc_t inproc, outproc; - void *in, *out; +callrpc( + const char *host, + int prognum, + int versnum, + int procnum, + xdrproc_t inproc, + void *in, + xdrproc_t outproc, + void *out) { return (int)rpc_call(host, (rpcprog_t)prognum, (rpcvers_t)versnum, @@ -417,10 +420,13 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out) * For connectionless kind of transport. Obsoleted by rpc_reg() */ int -registerrpc(prognum, versnum, procnum, progname, inproc, outproc) - int prognum, versnum, procnum; - char *(*progname)(char [UDPMSGSIZE]); - xdrproc_t inproc, outproc; +registerrpc( + int prognum, + int versnum, + int procnum, + char *(*progname)(char [UDPMSGSIZE]), + xdrproc_t inproc, + xdrproc_t outproc) { return rpc_reg((rpcprog_t)prognum, (rpcvers_t)versnum, @@ -439,10 +445,10 @@ extern thread_key_t clnt_broadcast_key; */ /* ARGSUSED */ static bool_t -rpc_wrap_bcast(resultp, addr, nconf) - char *resultp; /* results of the call */ - struct netbuf *addr; /* address of the guy who responded */ - struct netconfig *nconf; /* Netconf of the transport */ +rpc_wrap_bcast( + char *resultp, /* results of the call */ + struct netbuf *addr, /* address of the guy who responded */ + struct netconfig *nconf) /* Netconf of the transport */ { resultproc_t clnt_broadcast_result; @@ -457,15 +463,15 @@ rpc_wrap_bcast(resultp, addr, nconf) * Broadcasts on UDP transport. Obsoleted by rpc_broadcast(). */ enum clnt_stat -clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) - u_long prog; /* program number */ - u_long vers; /* version number */ - u_long proc; /* procedure number */ - xdrproc_t xargs; /* xdr routine for args */ - void *argsp; /* pointer to args */ - xdrproc_t xresults; /* xdr routine for results */ - void *resultsp; /* pointer to results */ - resultproc_t eachresult; /* call with each result obtained */ +clnt_broadcast( + u_long prog, /* program number */ + u_long vers, /* version number */ + u_long proc, /* procedure number */ + xdrproc_t xargs, /* xdr routine for args */ + void *argsp, /* pointer to args */ + xdrproc_t xresults, /* xdr routine for results */ + void *resultsp, /* pointer to results */ + resultproc_t eachresult) /* call with each result obtained */ { extern mutex_t tsd_lock; @@ -487,11 +493,11 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) * authdes_seccreate(). */ AUTH * -authdes_create(servername, window, syncaddr, ckey) - char *servername; /* network name of server */ - u_int window; /* time to live */ - struct sockaddr *syncaddr; /* optional hostaddr to sync with */ - des_block *ckey; /* optional conversation key to use */ +authdes_create( + char *servername, /* network name of server */ + u_int window, /* time to live */ + struct sockaddr *syncaddr, /* optional hostaddr to sync with */ + des_block *ckey) /* optional conversation key to use */ { AUTH *dummy; AUTH *nauth; @@ -519,13 +525,13 @@ fallback: * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() */ CLIENT * -clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz) - struct sockaddr_un *raddr; - u_long prog; - u_long vers; - int *sockp; - u_int sendsz; - u_int recvsz; +clntunix_create( + struct sockaddr_un *raddr, + u_long prog, + u_long vers, + int *sockp, + u_int sendsz, + u_int recvsz) { struct netbuf *svcaddr; struct netconfig *nconf; @@ -571,11 +577,11 @@ done: * Obsoleted by svc_vc_create(). */ SVCXPRT * -svcunix_create(sock, sendsize, recvsize, path) - int sock; - u_int sendsize; - u_int recvsize; - char *path; +svcunix_create( + int sock, + u_int sendsize, + u_int recvsize, + char *path) { struct netconfig *nconf; void *localhandle; @@ -632,10 +638,10 @@ done: * descriptor as its first input. Obsoleted by svc_fd_create(); */ SVCXPRT * -svcunixfd_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svcunixfd_create( + int fd, + u_int sendsize, + u_int recvsize) { return (svc_fd_create(fd, sendsize, recvsize)); } diff --git a/libtirpc/src/rpcb_clnt.c b/libtirpc/src/rpcb_clnt.c index d9806f3..6ab9055 100644 --- a/libtirpc/src/rpcb_clnt.c +++ b/libtirpc/src/rpcb_clnt.c @@ -107,9 +107,7 @@ static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *); * These are private routines that may not be provided in future releases. */ bool_t -__rpc_control(request, info) - int request; - void *info; +__rpc_control(int request, void *info) { switch (request) { case CLCR_GET_RPCB_TIMEOUT: @@ -149,8 +147,7 @@ extern rwlock_t rpcbaddr_cache_lock; */ static struct address_cache * -check_cache(host, netid) - const char *host, *netid; +check_cache(const char *host, const char *netid) { struct address_cache *cptr; @@ -170,8 +167,7 @@ check_cache(host, netid) } static void -delete_cache(addr) - struct netbuf *addr; +delete_cache(struct netbuf *addr) { struct address_cache *cptr, *prevptr = NULL; @@ -197,10 +193,11 @@ delete_cache(addr) } static void -add_cache(host, netid, taddr, uaddr) - const char *host, *netid; - char *uaddr; - struct netbuf *taddr; +add_cache( + const char *host, + const char *netid, + struct netbuf *taddr, + char *uaddr) { struct address_cache *ad_cache, *cptr, *prevptr; @@ -275,10 +272,10 @@ add_cache(host, netid, taddr, uaddr) * On error, returns NULL and free's everything. */ static CLIENT * -getclnthandle(host, nconf, targaddr) - const char *host; - const struct netconfig *nconf; - char **targaddr; +getclnthandle( + const char *host, + const struct netconfig *nconf, + char **targaddr) { CLIENT *client; struct netbuf *addr, taddr; @@ -520,11 +517,11 @@ try_nconf: * Calls the rpcbind service to do the mapping. */ bool_t -rpcb_set(program, version, nconf, address) - rpcprog_t program; - rpcvers_t version; - const struct netconfig *nconf; /* Network structure of transport */ - const struct netbuf *address; /* Services netconfig address */ +rpcb_set( + rpcprog_t program, + rpcvers_t version, + const struct netconfig *nconf, /* Network structure of transport */ + const struct netbuf *address) /* Services netconfig address */ { CLIENT *client; bool_t rslt = FALSE; @@ -581,10 +578,10 @@ rpcb_set(program, version, nconf, address) * only for the given transport. */ bool_t -rpcb_unset(program, version, nconf) - rpcprog_t program; - rpcvers_t version; - const struct netconfig *nconf; +rpcb_unset( + rpcprog_t program, + rpcvers_t version, + const struct netconfig *nconf) { CLIENT *client; bool_t rslt = FALSE; @@ -621,9 +618,9 @@ rpcb_unset(program, version, nconf) * From the merged list, find the appropriate entry */ static struct netbuf * -got_entry(relp, nconf) - rpcb_entry_list_ptr relp; - const struct netconfig *nconf; +got_entry( + rpcb_entry_list_ptr relp, + const struct netconfig *nconf) { struct netbuf *na = NULL; rpcb_entry_list_ptr sp; @@ -710,13 +707,13 @@ __rpcbind_is_up() * starts working properly. Also look under clnt_vc.c. */ struct netbuf * -__rpcb_findaddr_timed(program, version, nconf, host, clpp, tp) - rpcprog_t program; - rpcvers_t version; - const struct netconfig *nconf; - const char *host; - CLIENT **clpp; - struct timeval *tp; +__rpcb_findaddr_timed( + rpcprog_t program, + rpcvers_t version, + const struct netconfig *nconf, + const char *host, + CLIENT **clpp, + struct timeval *tp) { #ifdef NOTUSED static bool_t check_rpcbind = TRUE; @@ -940,12 +937,12 @@ done: * Assuming that the address is all properly allocated */ int -rpcb_getaddr(program, version, nconf, address, host) - rpcprog_t program; - rpcvers_t version; - const struct netconfig *nconf; - struct netbuf *address; - const char *host; +rpcb_getaddr( + rpcprog_t program, + rpcvers_t version, + const struct netconfig *nconf, + struct netbuf *address, + const char *host) { struct netbuf *na; @@ -976,9 +973,9 @@ rpcb_getaddr(program, version, nconf, address, host) * It returns NULL on failure. */ rpcblist * -rpcb_getmaps(nconf, host) - const struct netconfig *nconf; - const char *host; +rpcb_getmaps( + const struct netconfig *nconf, + const char *host) { rpcblist_ptr head = NULL; CLIENT *client; @@ -1028,17 +1025,18 @@ done: * programs to do a lookup and call in one step. */ enum clnt_stat -rpcb_rmtcall(nconf, host, prog, vers, proc, xdrargs, argsp, - xdrres, resp, tout, addr_ptr) - const struct netconfig *nconf; /* Netconfig structure */ - const char *host; /* Remote host name */ - rpcprog_t prog; - rpcvers_t vers; - rpcproc_t proc; /* Remote proc identifiers */ - xdrproc_t xdrargs, xdrres; /* XDR routines */ - caddr_t argsp, resp; /* Argument and Result */ - struct timeval tout; /* Timeout value for this call */ - const struct netbuf *addr_ptr; /* Preallocated netbuf address */ +rpcb_rmtcall( + const struct netconfig *nconf, /* Netconfig structure */ + const char *host, /* Remote host name */ + rpcprog_t prog, + rpcvers_t vers, + rpcproc_t proc, /* Remote proc identifiers */ + xdrproc_t xdrargs, /* In XDR routines */ + caddr_t argsp, /* In Argument */ + xdrproc_t xdrres, /* Out XDR routines */ + caddr_t resp, /* out Result */ + struct timeval tout, /* Timeout value for this call */ + const struct netbuf *addr_ptr) /* Preallocated netbuf address */ { CLIENT *client; enum clnt_stat stat; @@ -1110,9 +1108,7 @@ error: * Returns 1 if succeeds else 0. */ bool_t -rpcb_gettime(host, timep) - const char *host; - time_t *timep; +rpcb_gettime(const char *host, time_t *timep) { CLIENT *client = NULL; void *handle; @@ -1171,9 +1167,9 @@ rpcb_gettime(host, timep) * really be called because local n2a libraries are always provided. */ char * -rpcb_taddr2uaddr(nconf, taddr) - struct netconfig *nconf; - struct netbuf *taddr; +rpcb_taddr2uaddr( + struct netconfig *nconf, + struct netbuf *taddr) { CLIENT *client; char *uaddr = NULL; @@ -1205,9 +1201,9 @@ rpcb_taddr2uaddr(nconf, taddr) * really be called because local n2a libraries are always provided. */ struct netbuf * -rpcb_uaddr2taddr(nconf, uaddr) - struct netconfig *nconf; - char *uaddr; +rpcb_uaddr2taddr( + struct netconfig *nconf, + char *uaddr) { CLIENT *client; struct netbuf *taddr; diff --git a/libtirpc/src/rpcb_prot.c b/libtirpc/src/rpcb_prot.c index ea8bef7..c789b2f 100644 --- a/libtirpc/src/rpcb_prot.c +++ b/libtirpc/src/rpcb_prot.c @@ -47,9 +47,9 @@ #endif bool_t -xdr_rpcb(xdrs, objp) - XDR *xdrs; - RPCB *objp; +xdr_rpcb( + XDR *xdrs, + RPCB *objp) { if (!xdr_u_int32_t(xdrs, &objp->r_prog)) { return (FALSE); @@ -105,9 +105,9 @@ xdr_rpcb(xdrs, objp) */ bool_t -xdr_rpcblist_ptr(xdrs, rp) - XDR *xdrs; - rpcblist_ptr *rp; +xdr_rpcblist_ptr( + XDR *xdrs, + rpcblist_ptr *rp) { /* * more_elements is pre-computed in case the direction is @@ -159,9 +159,9 @@ xdr_rpcblist_ptr(xdrs, rp) * functionality to xdr_rpcblist_ptr(). */ bool_t -xdr_rpcblist(xdrs, rp) - XDR *xdrs; - RPCBLIST **rp; +xdr_rpcblist( + XDR *xdrs, + RPCBLIST **rp) { bool_t dummy; @@ -171,9 +171,9 @@ xdr_rpcblist(xdrs, rp) bool_t -xdr_rpcb_entry(xdrs, objp) - XDR *xdrs; - rpcb_entry *objp; +xdr_rpcb_entry( + XDR *xdrs, + rpcb_entry *objp) { #ifndef _WIN32 // CVE-2017-8779 if (!xdr_string(xdrs, &objp->r_maddr, (u_int)~0)) { @@ -212,9 +212,9 @@ xdr_rpcb_entry(xdrs, objp) } bool_t -xdr_rpcb_entry_list_ptr(xdrs, rp) - XDR *xdrs; - rpcb_entry_list_ptr *rp; +xdr_rpcb_entry_list_ptr( + XDR *xdrs, + rpcb_entry_list_ptr *rp) { /* * more_elements is pre-computed in case the direction is @@ -267,9 +267,9 @@ xdr_rpcb_entry_list_ptr(xdrs, rp) * written for XDR_ENCODE direction only */ bool_t -xdr_rpcb_rmtcallargs(xdrs, p) - XDR *xdrs; - struct rpcb_rmtcallargs *p; +xdr_rpcb_rmtcallargs( + XDR *xdrs, + struct rpcb_rmtcallargs *p) { struct r_rpcb_rmtcallargs *objp = (struct r_rpcb_rmtcallargs *)(void *)p; @@ -319,9 +319,9 @@ xdr_rpcb_rmtcallargs(xdrs, p) * written for XDR_DECODE direction only */ bool_t -xdr_rpcb_rmtcallres(xdrs, p) - XDR *xdrs; - struct rpcb_rmtcallres *p; +xdr_rpcb_rmtcallres( + XDR *xdrs, + struct rpcb_rmtcallres *p) { bool_t dummy; struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p; @@ -341,9 +341,9 @@ xdr_rpcb_rmtcallres(xdrs, p) } bool_t -xdr_netbuf(xdrs, objp) - XDR *xdrs; - struct netbuf *objp; +xdr_netbuf( + XDR *xdrs, + struct netbuf *objp) { bool_t dummy; diff --git a/libtirpc/src/rpcb_st_xdr.c b/libtirpc/src/rpcb_st_xdr.c index 5b0b11f..e5a431c 100644 --- a/libtirpc/src/rpcb_st_xdr.c +++ b/libtirpc/src/rpcb_st_xdr.c @@ -46,9 +46,9 @@ /* Link list of all the stats about getport and getaddr */ bool_t -xdr_rpcbs_addrlist(xdrs, objp) - XDR *xdrs; - rpcbs_addrlist *objp; +xdr_rpcbs_addrlist( + XDR *xdrs, + rpcbs_addrlist *objp) { if (!xdr_u_int32_t(xdrs, &objp->prog)) { @@ -83,9 +83,9 @@ xdr_rpcbs_addrlist(xdrs, objp) /* Link list of all the stats about rmtcall */ bool_t -xdr_rpcbs_rmtcalllist(xdrs, objp) - XDR *xdrs; - rpcbs_rmtcalllist *objp; +xdr_rpcbs_rmtcalllist( + XDR *xdrs, + rpcbs_rmtcalllist *objp) { int32_t *buf; @@ -208,9 +208,9 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) } bool_t -xdr_rpcbs_proc(xdrs, objp) - XDR *xdrs; - rpcbs_proc objp; +xdr_rpcbs_proc( + XDR *xdrs, + rpcbs_proc objp) { if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBSTAT_HIGHPROC, sizeof (int), (xdrproc_t)xdr_int)) { @@ -220,9 +220,9 @@ xdr_rpcbs_proc(xdrs, objp) } bool_t -xdr_rpcbs_addrlist_ptr(xdrs, objp) - XDR *xdrs; - rpcbs_addrlist_ptr *objp; +xdr_rpcbs_addrlist_ptr( + XDR *xdrs, + rpcbs_addrlist_ptr *objp) { if (!xdr_pointer(xdrs, (char **)objp, sizeof (rpcbs_addrlist), (xdrproc_t)xdr_rpcbs_addrlist)) { @@ -232,9 +232,9 @@ xdr_rpcbs_addrlist_ptr(xdrs, objp) } bool_t -xdr_rpcbs_rmtcalllist_ptr(xdrs, objp) - XDR *xdrs; - rpcbs_rmtcalllist_ptr *objp; +xdr_rpcbs_rmtcalllist_ptr( + XDR *xdrs, + rpcbs_rmtcalllist_ptr *objp) { if (!xdr_pointer(xdrs, (char **)objp, sizeof (rpcbs_rmtcalllist), (xdrproc_t)xdr_rpcbs_rmtcalllist)) { @@ -244,9 +244,9 @@ xdr_rpcbs_rmtcalllist_ptr(xdrs, objp) } bool_t -xdr_rpcb_stat(xdrs, objp) - XDR *xdrs; - rpcb_stat *objp; +xdr_rpcb_stat( + XDR *xdrs, + rpcb_stat *objp) { if (!xdr_rpcbs_proc(xdrs, objp->info)) { @@ -272,9 +272,9 @@ xdr_rpcb_stat(xdrs, objp) * being monitored. */ bool_t -xdr_rpcb_stat_byvers(xdrs, objp) - XDR *xdrs; - rpcb_stat_byvers objp; +xdr_rpcb_stat_byvers( + XDR *xdrs, + rpcb_stat_byvers objp) { if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBVERS_STAT, sizeof (rpcb_stat), (xdrproc_t)xdr_rpcb_stat)) { diff --git a/libtirpc/src/rpcdname.c b/libtirpc/src/rpcdname.c index a843e0e..37617c5 100644 --- a/libtirpc/src/rpcdname.c +++ b/libtirpc/src/rpcdname.c @@ -69,8 +69,7 @@ get_default_domain() * get rejected elsewhere in the NIS client package. */ int -__rpc_get_default_domain(domain) - char **domain; +__rpc_get_default_domain(char **domain) { if ((*domain = get_default_domain()) != 0) return (0); diff --git a/libtirpc/src/rtime.c b/libtirpc/src/rtime.c index 44c5c7b..4a6ac15 100644 --- a/libtirpc/src/rtime.c +++ b/libtirpc/src/rtime.c @@ -62,10 +62,10 @@ extern int _rpc_dtablesize( void ); static void do_close( int ); int -rtime(addrp, timep, timeout) - struct sockaddr_in *addrp; - struct timeval *timep; - struct timeval *timeout; +rtime( + struct sockaddr_in *addrp, + struct timeval *timep, + struct timeval *timeout) { int s; fd_set readfds; @@ -144,8 +144,7 @@ rtime(addrp, timep, timeout) } static void -do_close(s) - int s; +do_close(int s) { int save; diff --git a/libtirpc/src/svc.c b/libtirpc/src/svc.c index 22e3746..e2fa30a 100644 --- a/libtirpc/src/svc.c +++ b/libtirpc/src/svc.c @@ -94,8 +94,7 @@ static void __xprt_do_unregister (SVCXPRT * xprt, bool_t dolock); * Activate a transport handle. */ void -xprt_register (xprt) - SVCXPRT *xprt; +xprt_register (SVCXPRT *xprt) { int sock; @@ -141,9 +140,9 @@ __xprt_unregister_unlocked (SVCXPRT * xprt) * De-activate a transport handle. */ static void -__xprt_do_unregister (xprt, dolock) -SVCXPRT *xprt; -bool_t dolock; +__xprt_do_unregister ( + SVCXPRT *xprt, + bool_t dolock) { int sock; @@ -176,12 +175,12 @@ bool_t dolock; * program number comes in. */ bool_t -svc_reg (xprt, prog, vers, dispatch, nconf) - SVCXPRT *xprt; - const rpcprog_t prog; - const rpcvers_t vers; - void (*dispatch) (struct svc_req *, SVCXPRT *); - const struct netconfig *nconf; +svc_reg ( + SVCXPRT *xprt, + const rpcprog_t prog, + const rpcvers_t vers, + void (*dispatch) (struct svc_req *, SVCXPRT *), + const struct netconfig *nconf) { bool_t dummy; struct svc_callout *prev; @@ -258,9 +257,9 @@ rpcb_it: * Remove a service program from the callout list. */ void -svc_unreg (prog, vers) - const rpcprog_t prog; - const rpcvers_t vers; +svc_unreg ( + const rpcprog_t prog, + const rpcvers_t vers) { struct svc_callout *prev; struct svc_callout *s; @@ -295,12 +294,12 @@ svc_unreg (prog, vers) * program number comes in. */ bool_t -svc_register (xprt, prog, vers, dispatch, protocol) - SVCXPRT *xprt; - u_long prog; - u_long vers; - void (*dispatch) (struct svc_req *, SVCXPRT *); - int protocol; +svc_register ( + SVCXPRT *xprt, + u_long prog, + u_long vers, + void (*dispatch) (struct svc_req *, SVCXPRT *), + int protocol) { struct svc_callout *prev; struct svc_callout *s; @@ -338,9 +337,9 @@ pmap_it: * Remove a service program from the callout list. */ void -svc_unregister (prog, vers) - u_long prog; - u_long vers; +svc_unregister ( + u_long prog, + u_long vers) { struct svc_callout *prev; struct svc_callout *s; @@ -368,11 +367,11 @@ svc_unregister (prog, vers) * struct. */ static struct svc_callout * -svc_find (prog, vers, prev, netid) - rpcprog_t prog; - rpcvers_t vers; - struct svc_callout **prev; - char *netid; +svc_find ( + rpcprog_t prog, + rpcvers_t vers, + struct svc_callout **prev, + char *netid) { struct svc_callout *s, *p; @@ -397,10 +396,10 @@ svc_find (prog, vers, prev, netid) * Send a reply to an rpc request */ bool_t -svc_sendreply (xprt, xdr_results, xdr_location) - SVCXPRT *xprt; - xdrproc_t xdr_results; - void *xdr_location; +svc_sendreply ( + SVCXPRT *xprt, + xdrproc_t xdr_results, + void *xdr_location) { struct rpc_msg rply; @@ -419,8 +418,7 @@ svc_sendreply (xprt, xdr_results, xdr_location) * No procedure error reply */ void -svcerr_noproc (xprt) - SVCXPRT *xprt; +svcerr_noproc (SVCXPRT *xprt) { struct rpc_msg rply; @@ -437,8 +435,7 @@ svcerr_noproc (xprt) * Can't decode args error reply */ void -svcerr_decode (xprt) - SVCXPRT *xprt; +svcerr_decode (SVCXPRT *xprt) { struct rpc_msg rply; @@ -455,8 +452,7 @@ svcerr_decode (xprt) * Some system error */ void -svcerr_systemerr (xprt) - SVCXPRT *xprt; +svcerr_systemerr (SVCXPRT *xprt) { struct rpc_msg rply; @@ -515,9 +511,9 @@ __svc_versquiet_get (xprt) * Authentication error reply */ void -svcerr_auth (xprt, why) - SVCXPRT *xprt; - enum auth_stat why; +svcerr_auth ( + SVCXPRT *xprt, + enum auth_stat why) { struct rpc_msg rply; @@ -534,8 +530,7 @@ svcerr_auth (xprt, why) * Auth too weak error reply */ void -svcerr_weakauth (xprt) - SVCXPRT *xprt; +svcerr_weakauth (SVCXPRT *xprt) { assert (xprt != NULL); @@ -547,8 +542,7 @@ svcerr_weakauth (xprt) * Program unavailable error reply */ void -svcerr_noprog (xprt) - SVCXPRT *xprt; +svcerr_noprog (SVCXPRT *xprt) { struct rpc_msg rply; @@ -565,10 +559,10 @@ svcerr_noprog (xprt) * Program version mismatch error reply */ void -svcerr_progvers (xprt, low_vers, high_vers) - SVCXPRT *xprt; - rpcvers_t low_vers; - rpcvers_t high_vers; +svcerr_progvers ( + SVCXPRT *xprt, + rpcvers_t low_vers, + rpcvers_t high_vers) { struct rpc_msg rply; @@ -602,8 +596,7 @@ svcerr_progvers (xprt, low_vers, high_vers) */ void -svc_getreq (rdfds) - int rdfds; +svc_getreq (int rdfds) { fd_set readfds; @@ -613,8 +606,7 @@ svc_getreq (rdfds) } void -svc_getreqset (readfds) - fd_set *readfds; +svc_getreqset (fd_set *readfds) { #ifndef _WIN32 int bit, fd; @@ -743,9 +735,9 @@ svc_getreq_common (int fd) void -svc_getreq_poll (pfdp, pollretval) - struct pollfd *pfdp; - int pollretval; +svc_getreq_poll ( + struct pollfd *pfdp, + int pollretval) { int i; int fds_found; diff --git a/libtirpc/src/svc_auth.c b/libtirpc/src/svc_auth.c index ac6b7ed..0651b3e 100644 --- a/libtirpc/src/svc_auth.c +++ b/libtirpc/src/svc_auth.c @@ -83,9 +83,9 @@ static struct authsvc *Auths = NULL; * invalid. */ enum auth_stat -_authenticate(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; +_authenticate( + struct svc_req *rqst, + struct rpc_msg *msg) { int cred_flavor; struct authsvc *asp; @@ -135,9 +135,9 @@ _authenticate(rqst, msg) /*ARGSUSED*/ enum auth_stat -_svcauth_null(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; +_svcauth_null( + struct svc_req *rqst, + struct rpc_msg *msg) { return (AUTH_OK); } @@ -157,9 +157,9 @@ _svcauth_null(rqst, msg) */ int -svc_auth_reg(cred_flavor, handler) - int cred_flavor; - enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *); +svc_auth_reg( + int cred_flavor, + enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *)) { struct authsvc *asp; extern mutex_t authsvc_lock; diff --git a/libtirpc/src/svc_auth_unix.c b/libtirpc/src/svc_auth_unix.c index b8e572e..90c59bd 100644 --- a/libtirpc/src/svc_auth_unix.c +++ b/libtirpc/src/svc_auth_unix.c @@ -48,9 +48,9 @@ * Unix longhand authenticator */ enum auth_stat -_svcauth_unix(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; +_svcauth_unix( + struct svc_req *rqst, + struct rpc_msg *msg) { enum auth_stat stat; XDR xdrs; @@ -139,9 +139,9 @@ done: */ /*ARGSUSED*/ enum auth_stat -_svcauth_short(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; +_svcauth_short( + struct svc_req *rqst, + struct rpc_msg *msg) { return (AUTH_REJECTEDCRED); } diff --git a/libtirpc/src/svc_dg.c b/libtirpc/src/svc_dg.c index b02eb26..d07d569 100644 --- a/libtirpc/src/svc_dg.c +++ b/libtirpc/src/svc_dg.c @@ -92,10 +92,10 @@ static const char svc_dg_err2[] = " transport does not support data transfer"; static const char __no_mem_str[] = "out of memory"; SVCXPRT * -svc_dg_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svc_dg_create( + int fd, + u_int sendsize, + u_int recvsize) { SVCXPRT *xprt; struct svc_dg_data *su = NULL; @@ -157,16 +157,15 @@ freedata: /*ARGSUSED*/ static enum xprt_stat -svc_dg_stat(xprt) - SVCXPRT *xprt; +svc_dg_stat(SVCXPRT *xprt) { return (XPRT_IDLE); } static bool_t -svc_dg_recv(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svc_dg_recv( + SVCXPRT *xprt, + struct rpc_msg *msg) { struct svc_dg_data *su = su_data(xprt); XDR *xdrs = &(su->su_xdrs); @@ -206,9 +205,9 @@ again: } static bool_t -svc_dg_reply(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svc_dg_reply( + SVCXPRT *xprt, + struct rpc_msg *msg) { struct svc_dg_data *su = su_data(xprt); XDR *xdrs = &(su->su_xdrs); @@ -233,19 +232,19 @@ svc_dg_reply(xprt, msg) } static bool_t -svc_dg_getargs(xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - void *args_ptr; +svc_dg_getargs( + SVCXPRT *xprt, + xdrproc_t xdr_args, + void *args_ptr) { return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr); } static bool_t -svc_dg_freeargs(xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - void *args_ptr; +svc_dg_freeargs( + SVCXPRT *xprt, + xdrproc_t xdr_args, + void *args_ptr) { XDR *xdrs = &(su_data(xprt)->su_xdrs); @@ -254,8 +253,7 @@ svc_dg_freeargs(xprt, xdr_args, args_ptr) } static void -svc_dg_destroy(xprt) - SVCXPRT *xprt; +svc_dg_destroy(SVCXPRT *xprt) { struct svc_dg_data *su = su_data(xprt); @@ -276,17 +274,16 @@ svc_dg_destroy(xprt) static bool_t /*ARGSUSED*/ -svc_dg_control(xprt, rq, in) - SVCXPRT *xprt; - const u_int rq; - void *in; +svc_dg_control( + SVCXPRT *xprt, + const u_int rq, + void *in) { return (FALSE); } static void -svc_dg_ops(xprt) - SVCXPRT *xprt; +svc_dg_ops(SVCXPRT *xprt) { static struct xp_ops ops; static struct xp_ops2 ops2; @@ -387,9 +384,9 @@ static const char alloc_err[] = "could not allocate cache "; static const char enable_err[] = "cache already enabled"; int -svc_dg_enablecache(transp, size) - SVCXPRT *transp; - u_int size; +svc_dg_enablecache( + SVCXPRT *transp, + u_int size) { struct svc_dg_data *su = su_data(transp); struct cl_cache *uc; @@ -444,9 +441,9 @@ static const char cache_set_err2[] = "victim alloc failed"; static const char cache_set_err3[] = "could not allocate new rpc buffer"; static void -cache_set(xprt, replylen) - SVCXPRT *xprt; - size_t replylen; +cache_set( + SVCXPRT *xprt, + size_t replylen) { cache_ptr victim; cache_ptr *vicp; @@ -535,11 +532,11 @@ cache_set(xprt, replylen) * return 1 if found, 0 if not found and set the stage for cache_set() */ static int -cache_get(xprt, msg, replyp, replylenp) - SVCXPRT *xprt; - struct rpc_msg *msg; - char **replyp; - size_t *replylenp; +cache_get( + SVCXPRT *xprt, + struct rpc_msg *msg, + char **replyp, + size_t *replylenp) { u_int loc; cache_ptr ent; diff --git a/libtirpc/src/svc_generic.c b/libtirpc/src/svc_generic.c index 24b0479..762123b 100644 --- a/libtirpc/src/svc_generic.c +++ b/libtirpc/src/svc_generic.c @@ -65,11 +65,11 @@ extern int __svc_vc_setflag(SVCXPRT *, int); * created earlier instead of creating a new handle every time. */ int -svc_create(dispatch, prognum, versnum, nettype) - void (*dispatch)(struct svc_req *, SVCXPRT *); - rpcprog_t prognum; /* Program number */ - rpcvers_t versnum; /* Version number */ - const char *nettype; /* Networktype token */ +svc_create( + void (*dispatch)(struct svc_req *, SVCXPRT *), + rpcprog_t prognum, /* Program number */ + rpcvers_t versnum, /* Version number */ + const char *nettype) /* Networktype token */ { struct xlist { SVCXPRT *xprt; /* Server handle */ @@ -138,11 +138,11 @@ svc_create(dispatch, prognum, versnum, nettype) * with the rpcbind. It calls svc_tli_create(); */ SVCXPRT * -svc_tp_create(dispatch, prognum, versnum, nconf) - void (*dispatch)(struct svc_req *, SVCXPRT *); - rpcprog_t prognum; /* Program number */ - rpcvers_t versnum; /* Version number */ - const struct netconfig *nconf; /* Netconfig structure for the network */ +svc_tp_create( + void (*dispatch)(struct svc_req *, SVCXPRT *), + rpcprog_t prognum, /* Program number */ + rpcvers_t versnum, /* Version number */ + const struct netconfig *nconf) /* Netconfig structure for the network */ { SVCXPRT *xprt; @@ -179,12 +179,12 @@ svc_tp_create(dispatch, prognum, versnum, nconf) * If sendsz or recvsz are zero, their default values are chosen. */ SVCXPRT * -svc_tli_create(fd, nconf, bindaddr, sendsz, recvsz) - int fd; /* Connection end point */ - const struct netconfig *nconf; /* Netconfig struct for nettoken */ - const struct t_bind *bindaddr; /* Local bind address */ - u_int sendsz; /* Max sendsize */ - u_int recvsz; /* Max recvsize */ +svc_tli_create( + int fd, /* Connection end point */ + const struct netconfig *nconf, /* Netconfig struct for nettoken */ + const struct t_bind *bindaddr, /* Local bind address */ + u_int sendsz, /* Max sendsize */ + u_int recvsz) /* Max recvsize */ { SVCXPRT *xprt = NULL; /* service handle */ bool_t madefd = FALSE; /* whether fd opened here */ diff --git a/libtirpc/src/svc_raw.c b/libtirpc/src/svc_raw.c index 4324c44..55e29ac 100644 --- a/libtirpc/src/svc_raw.c +++ b/libtirpc/src/svc_raw.c @@ -104,17 +104,17 @@ svc_raw_create() /*ARGSUSED*/ static enum xprt_stat -svc_raw_stat(xprt) -SVCXPRT *xprt; /* args needed to satisfy ANSI-C typechecking */ +svc_raw_stat( +SVCXPRT *xprt) /* args needed to satisfy ANSI-C typechecking */ { return (XPRT_IDLE); } /*ARGSUSED*/ static bool_t -svc_raw_recv(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svc_raw_recv( + SVCXPRT *xprt, + struct rpc_msg *msg) { struct svc_raw_private *srp; XDR *xdrs; @@ -138,9 +138,9 @@ svc_raw_recv(xprt, msg) /*ARGSUSED*/ static bool_t -svc_raw_reply(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svc_raw_reply( + SVCXPRT *xprt, + struct rpc_msg *msg) { struct svc_raw_private *srp; XDR *xdrs; @@ -165,10 +165,10 @@ svc_raw_reply(xprt, msg) /*ARGSUSED*/ static bool_t -svc_raw_getargs(xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - void *args_ptr; +svc_raw_getargs( + SVCXPRT *xprt, + xdrproc_t xdr_args, + void *args_ptr) { struct svc_raw_private *srp; @@ -184,10 +184,10 @@ svc_raw_getargs(xprt, xdr_args, args_ptr) /*ARGSUSED*/ static bool_t -svc_raw_freeargs(xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - void *args_ptr; +svc_raw_freeargs( + SVCXPRT *xprt, + xdrproc_t xdr_args, + void *args_ptr) { struct svc_raw_private *srp; XDR *xdrs; @@ -207,24 +207,22 @@ svc_raw_freeargs(xprt, xdr_args, args_ptr) /*ARGSUSED*/ static void -svc_raw_destroy(xprt) -SVCXPRT *xprt; +svc_raw_destroy(SVCXPRT *xprt) { } /*ARGSUSED*/ static bool_t -svc_raw_control(xprt, rq, in) - SVCXPRT *xprt; - const u_int rq; - void *in; +svc_raw_control( + SVCXPRT *xprt, + const u_int rq, + void *in) { return (FALSE); } static void -svc_raw_ops(xprt) - SVCXPRT *xprt; +svc_raw_ops(SVCXPRT *xprt) { static struct xp_ops ops; static struct xp_ops2 ops2; diff --git a/libtirpc/src/svc_simple.c b/libtirpc/src/svc_simple.c index 3ad528e..925089c 100644 --- a/libtirpc/src/svc_simple.c +++ b/libtirpc/src/svc_simple.c @@ -89,13 +89,14 @@ static const char __no_mem_str[] = "out of memory"; */ int -rpc_reg(prognum, versnum, procnum, progname, inproc, outproc, nettype) - rpcprog_t prognum; /* program number */ - rpcvers_t versnum; /* version number */ - rpcproc_t procnum; /* procedure number */ - char *(*progname)(char *); /* Server routine */ - xdrproc_t inproc, outproc; /* in/out XDR procedures */ - char *nettype; /* nettype */ +rpc_reg( + rpcprog_t prognum, /* program number */ + rpcvers_t versnum, /* version number */ + rpcproc_t procnum, /* procedure number */ + char *(*progname)(char *), /* Server routine */ + xdrproc_t inproc, /* in XDR procedures */ + xdrproc_t outproc, /* out XDR procedures */ + char *nettype) /* nettype */ { struct netconfig *nconf; int done = FALSE; @@ -232,9 +233,7 @@ rpc_reg(prognum, versnum, procnum, progname, inproc, outproc, nettype) */ static void -universal(rqstp, transp) - struct svc_req *rqstp; - SVCXPRT *transp; +universal(struct svc_req *rqstp, SVCXPRT *transp) { rpcprog_t prog; rpcvers_t vers; diff --git a/libtirpc/src/svc_vc.c b/libtirpc/src/svc_vc.c index 8b8a7dd..05640e7 100644 --- a/libtirpc/src/svc_vc.c +++ b/libtirpc/src/svc_vc.c @@ -145,10 +145,10 @@ __xprt_set_raddr(SVCXPRT *xprt, const struct sockaddr_storage *ss) * 0 => use the system default. */ SVCXPRT * -svc_vc_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svc_vc_create( + int fd, + u_int sendsize, + u_int recvsize) { SVCXPRT *xprt; struct cf_rendezvous *r = NULL; @@ -203,10 +203,10 @@ cleanup_svc_vc_create: * descriptor as its first input. */ SVCXPRT * -svc_fd_create(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +svc_fd_create( + int fd, + u_int sendsize, + u_int recvsize) { struct sockaddr_storage ss; socklen_t slen; @@ -251,10 +251,10 @@ freedata: } static SVCXPRT * -makefd_xprt(fd, sendsize, recvsize) - int fd; - u_int sendsize; - u_int recvsize; +makefd_xprt( + int fd, + u_int sendsize, + u_int recvsize) { SVCXPRT *xprt; struct cf_conn *cd; @@ -300,9 +300,9 @@ done: /*ARGSUSED*/ static bool_t -rendezvous_request(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +rendezvous_request( + SVCXPRT *xprt, + struct rpc_msg *msg) { int sock; #ifndef _WIN32 @@ -401,16 +401,14 @@ again: /*ARGSUSED*/ static enum xprt_stat -rendezvous_stat(xprt) - SVCXPRT *xprt; +rendezvous_stat(SVCXPRT *xprt) { return (XPRT_IDLE); } static void -svc_vc_destroy(xprt) - SVCXPRT *xprt; +svc_vc_destroy(SVCXPRT *xprt) { assert(xprt != NULL); @@ -419,8 +417,7 @@ svc_vc_destroy(xprt) } static void -__svc_vc_dodestroy(xprt) - SVCXPRT *xprt; +__svc_vc_dodestroy(SVCXPRT *xprt) { struct cf_conn *cd; struct cf_rendezvous *r; @@ -452,19 +449,19 @@ __svc_vc_dodestroy(xprt) /*ARGSUSED*/ static bool_t -svc_vc_control(xprt, rq, in) - SVCXPRT *xprt; - const u_int rq; - void *in; +svc_vc_control( + SVCXPRT *xprt, + const u_int rq, + void *in) { return (FALSE); } static bool_t -svc_vc_rendezvous_control(xprt, rq, in) - SVCXPRT *xprt; - const u_int rq; - void *in; +svc_vc_rendezvous_control( + SVCXPRT *xprt, + const u_int rq, + void *in) { struct cf_rendezvous *cfp; @@ -492,10 +489,10 @@ svc_vc_rendezvous_control(xprt, rq, in) * fatal for the connection. */ static int -read_vc(xprtp, buf, len) - void *xprtp; - void *buf; - int len; +read_vc( + void *xprtp, + void *buf, + int len) { SVCXPRT *xprt; int sock; @@ -567,10 +564,10 @@ fatal_err: * Any error is fatal and the connection is closed. */ static int -write_vc(xprtp, bufp, len) - void *xprtp; - void *bufp; - int len; +write_vc( + void *xprtp, + void *bufp, + int len) { SVCXPRT *xprt; char *buf; @@ -619,8 +616,7 @@ write_vc(xprtp, bufp, len) } static enum xprt_stat -svc_vc_stat(xprt) - SVCXPRT *xprt; +svc_vc_stat(SVCXPRT *xprt) { struct cf_conn *cd; @@ -636,9 +632,9 @@ svc_vc_stat(xprt) } static bool_t -svc_vc_recv(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svc_vc_recv( + SVCXPRT *xprt, + struct rpc_msg *msg) { struct cf_conn *cd; XDR *xdrs; @@ -665,10 +661,10 @@ svc_vc_recv(xprt, msg) } static bool_t -svc_vc_getargs(xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - void *args_ptr; +svc_vc_getargs( + SVCXPRT *xprt, + xdrproc_t xdr_args, + void *args_ptr) { assert(xprt != NULL); @@ -678,10 +674,10 @@ svc_vc_getargs(xprt, xdr_args, args_ptr) } static bool_t -svc_vc_freeargs(xprt, xdr_args, args_ptr) - SVCXPRT *xprt; - xdrproc_t xdr_args; - void *args_ptr; +svc_vc_freeargs( + SVCXPRT *xprt, + xdrproc_t xdr_args, + void *args_ptr) { XDR *xdrs; @@ -695,9 +691,9 @@ svc_vc_freeargs(xprt, xdr_args, args_ptr) } static bool_t -svc_vc_reply(xprt, msg) - SVCXPRT *xprt; - struct rpc_msg *msg; +svc_vc_reply( + SVCXPRT *xprt, + struct rpc_msg *msg) { struct cf_conn *cd; XDR *xdrs; @@ -717,8 +713,7 @@ svc_vc_reply(xprt, msg) } static void -svc_vc_ops(xprt) - SVCXPRT *xprt; +svc_vc_ops(SVCXPRT *xprt) { static struct xp_ops ops; static struct xp_ops2 ops2; @@ -742,8 +737,7 @@ svc_vc_ops(xprt) } static void -svc_vc_rendezvous_ops(xprt) - SVCXPRT *xprt; +svc_vc_rendezvous_ops(SVCXPRT *xprt) { static struct xp_ops ops; static struct xp_ops2 ops2; diff --git a/libtirpc/src/xdr.c b/libtirpc/src/xdr.c index 0b9b97d..51e58ac 100644 --- a/libtirpc/src/xdr.c +++ b/libtirpc/src/xdr.c @@ -67,9 +67,9 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 }; * Not a filter, but a convenient utility nonetheless */ void -xdr_free(proc, objp) - xdrproc_t proc; - void *objp; +xdr_free( + xdrproc_t proc, + void *objp) { XDR x; @@ -92,9 +92,9 @@ xdr_void(void) * XDR integers */ bool_t -xdr_int(xdrs, ip) - XDR *xdrs; - int *ip; +xdr_int( + XDR *xdrs, + int *ip) { long l; @@ -122,9 +122,9 @@ xdr_int(xdrs, ip) * XDR unsigned integers */ bool_t -xdr_u_int(xdrs, up) - XDR *xdrs; - u_int *up; +xdr_u_int( + XDR *xdrs, + u_int *up) { u_long l; @@ -154,9 +154,9 @@ xdr_u_int(xdrs, up) * same as xdr_u_long - open coded to save a proc call! */ bool_t -xdr_long(xdrs, lp) - XDR *xdrs; - long *lp; +xdr_long( + XDR *xdrs, + long *lp) { switch (xdrs->x_op) { case XDR_ENCODE: @@ -175,9 +175,9 @@ xdr_long(xdrs, lp) * same as xdr_long - open coded to save a proc call! */ bool_t -xdr_u_long(xdrs, ulp) - XDR *xdrs; - u_long *ulp; +xdr_u_long( + XDR *xdrs, + u_long *ulp) { switch (xdrs->x_op) { case XDR_ENCODE: @@ -197,9 +197,9 @@ xdr_u_long(xdrs, ulp) * same as xdr_u_int32_t - open coded to save a proc call! */ bool_t -xdr_int32_t(xdrs, int32_p) - XDR *xdrs; - int32_t *int32_p; +xdr_int32_t( + XDR *xdrs, + int32_t *int32_p) { long l; @@ -228,9 +228,9 @@ xdr_int32_t(xdrs, int32_p) * same as xdr_int32_t - open coded to save a proc call! */ bool_t -xdr_u_int32_t(xdrs, u_int32_p) - XDR *xdrs; - u_int32_t *u_int32_p; +xdr_u_int32_t( + XDR *xdrs, + u_int32_t *u_int32_p) { u_long l; @@ -259,9 +259,9 @@ xdr_u_int32_t(xdrs, u_int32_p) * XDR unsigned 32-bit integers */ bool_t -xdr_uint32_t(xdrs, uint32_p) - XDR *xdrs; - uint32_t *uint32_p; +xdr_uint32_t( + XDR *xdrs, + uint32_t *uint32_p) { return (xdr_u_int32_t(xdrs, (u_int32_t *)uint32_p)); } @@ -271,9 +271,9 @@ xdr_uint32_t(xdrs, uint32_p) * XDR short integers */ bool_t -xdr_short(xdrs, sp) - XDR *xdrs; - short *sp; +xdr_short( + XDR *xdrs, + short *sp) { long l; @@ -301,9 +301,9 @@ xdr_short(xdrs, sp) * XDR unsigned short integers */ bool_t -xdr_u_short(xdrs, usp) - XDR *xdrs; - u_short *usp; +xdr_u_short( + XDR *xdrs, + u_short *usp) { u_long l; @@ -332,9 +332,9 @@ xdr_u_short(xdrs, usp) * XDR 16-bit integers */ bool_t -xdr_int16_t(xdrs, int16_p) - XDR *xdrs; - int16_t *int16_p; +xdr_int16_t( + XDR *xdrs, + int16_t *int16_p) { long l; @@ -362,9 +362,9 @@ xdr_int16_t(xdrs, int16_p) * XDR unsigned 16-bit integers */ bool_t -xdr_u_int16_t(xdrs, u_int16_p) - XDR *xdrs; - u_int16_t *u_int16_p; +xdr_u_int16_t( + XDR *xdrs, + u_int16_t *u_int16_p) { u_long l; @@ -393,9 +393,9 @@ xdr_u_int16_t(xdrs, u_int16_p) * XDR unsigned 16-bit integers */ bool_t -xdr_uint16_t(xdrs, uint16_p) - XDR *xdrs; - uint16_t *uint16_p; +xdr_uint16_t( + XDR *xdrs, + uint16_t *uint16_p) { return (xdr_u_int16_t(xdrs, (u_int16_t *)uint16_p)); } @@ -405,9 +405,9 @@ xdr_uint16_t(xdrs, uint16_p) * XDR 8-bit integers */ bool_t -xdr_int8_t(xdrs, int8_p) - XDR *xdrs; - int8_t *int8_p; +xdr_int8_t( + XDR *xdrs, + int8_t *int8_p) { long l; @@ -436,9 +436,9 @@ xdr_int8_t(xdrs, int8_p) * XDR unsigned 8-bit integers */ bool_t -xdr_u_int8_t(xdrs, uint8_p) - XDR *xdrs; - uint8_t *uint8_p; +xdr_u_int8_t( + XDR *xdrs, + uint8_t *uint8_p) { u_long l; @@ -467,9 +467,9 @@ xdr_u_int8_t(xdrs, uint8_p) * XDR unsigned 8-bit integers */ bool_t -xdr_uint8_t(xdrs, uint8_p) - XDR *xdrs; - uint8_t *uint8_p; +xdr_uint8_t( + XDR *xdrs, + uint8_t *uint8_p) { return (xdr_u_int8_t(xdrs, (uint8_t *)uint8_p)); } @@ -479,9 +479,9 @@ xdr_uint8_t(xdrs, uint8_p) * XDR a char */ bool_t -xdr_char(xdrs, cp) - XDR *xdrs; - char *cp; +xdr_char( + XDR *xdrs, + char *cp) { int i; @@ -497,9 +497,9 @@ xdr_char(xdrs, cp) * XDR an unsigned char */ bool_t -xdr_u_char(xdrs, cp) - XDR *xdrs; - u_char *cp; +xdr_u_char( + XDR *xdrs, + u_char *cp) { u_int u; @@ -515,9 +515,9 @@ xdr_u_char(xdrs, cp) * XDR booleans */ bool_t -xdr_bool(xdrs, bp) - XDR *xdrs; - bool_t *bp; +xdr_bool( + XDR *xdrs, + bool_t *bp) { long lb; @@ -545,9 +545,9 @@ xdr_bool(xdrs, bp) * XDR enumerations */ bool_t -xdr_enum(xdrs, ep) - XDR *xdrs; - enum_t *ep; +xdr_enum( + XDR *xdrs, + enum_t *ep) { enum sizecheck { SIZEVAL }; /* used to find the size of an enum */ @@ -581,10 +581,10 @@ xdr_enum(xdrs, ep) * cp points to the opaque object and cnt gives the byte length. */ bool_t -xdr_opaque(xdrs, cp, cnt) - XDR *xdrs; - caddr_t cp; - u_int cnt; +xdr_opaque( + XDR *xdrs, + caddr_t cp, + u_int cnt) { u_int rndup; static int crud[BYTES_PER_XDR_UNIT]; @@ -633,11 +633,11 @@ xdr_opaque(xdrs, cp, cnt) * 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; @@ -698,9 +698,9 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) * 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)); @@ -718,12 +718,12 @@ xdr_netobj(xdrs, np) * If there is no specific or default routine an error is returned. */ bool_t -xdr_union(xdrs, dscmp, unp, choices, dfault) - XDR *xdrs; - enum_t *dscmp; /* enum to decide which arm to work on */ - char *unp; /* the union itself */ - const struct xdr_discrim *choices; /* [value, xdr proc] for each arm */ - xdrproc_t dfault; /* default xdr routine */ +xdr_union( + XDR *xdrs, + enum_t *dscmp, /* enum to decide which arm to work on */ + char *unp, /* the union itself */ + const struct xdr_discrim *choices, /* [value, xdr proc] for each arm */ + xdrproc_t dfault) /* default xdr routine */ { enum_t dscm; @@ -767,10 +767,10 @@ xdr_union(xdrs, dscmp, unp, choices, dfault) * 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 */ u_int size; @@ -850,9 +850,9 @@ xdr_string(xdrs, cpp, maxsize) * routines like clnt_call */ bool_t -xdr_wrapstring(xdrs, cpp) - XDR *xdrs; - char **cpp; +xdr_wrapstring( + XDR *xdrs, + char **cpp) { return xdr_string(xdrs, cpp, RPC_MAXDATASIZE); } @@ -869,9 +869,9 @@ xdr_wrapstring(xdrs, cpp) * XDR 64-bit integers */ bool_t -xdr_int64_t(xdrs, llp) - XDR *xdrs; - int64_t *llp; +xdr_int64_t( + XDR *xdrs, + int64_t *llp) { u_long ul[2]; @@ -903,9 +903,9 @@ xdr_int64_t(xdrs, llp) * XDR unsigned 64-bit integers */ bool_t -xdr_u_int64_t(xdrs, ullp) - XDR *xdrs; - u_int64_t *ullp; +xdr_u_int64_t( + XDR *xdrs, + u_int64_t *ullp) { u_long ul[2]; @@ -937,9 +937,9 @@ xdr_u_int64_t(xdrs, ullp) * XDR unsigned 64-bit integers */ bool_t -xdr_uint64_t(xdrs, ullp) - XDR *xdrs; - uint64_t *ullp; +xdr_uint64_t( + XDR *xdrs, + uint64_t *ullp) { return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp)); } @@ -949,9 +949,9 @@ xdr_uint64_t(xdrs, ullp) * XDR hypers */ bool_t -xdr_hyper(xdrs, llp) - XDR *xdrs; - longlong_t *llp; +xdr_hyper( + XDR *xdrs, + longlong_t *llp) { /* @@ -966,9 +966,9 @@ xdr_hyper(xdrs, llp) * XDR unsigned hypers */ bool_t -xdr_u_hyper(xdrs, ullp) - XDR *xdrs; - u_longlong_t *ullp; +xdr_u_hyper( + XDR *xdrs, + u_longlong_t *ullp) { /* @@ -983,9 +983,9 @@ xdr_u_hyper(xdrs, ullp) * XDR longlong_t's */ bool_t -xdr_longlong_t(xdrs, llp) - XDR *xdrs; - longlong_t *llp; +xdr_longlong_t( + XDR *xdrs, + longlong_t *llp) { /* @@ -1000,9 +1000,9 @@ xdr_longlong_t(xdrs, llp) * XDR u_longlong_t's */ bool_t -xdr_u_longlong_t(xdrs, ullp) - XDR *xdrs; - u_longlong_t *ullp; +xdr_u_longlong_t( + XDR *xdrs, + u_longlong_t *ullp) { /* @@ -1016,9 +1016,9 @@ xdr_u_longlong_t(xdrs, ullp) * XDR quad_t */ bool_t -xdr_quad_t(xdrs, llp) - XDR *xdrs; - int64_t *llp; +xdr_quad_t( + XDR *xdrs, + int64_t *llp) { return (xdr_int64_t(xdrs, (int64_t *)llp)); } @@ -1028,9 +1028,9 @@ xdr_quad_t(xdrs, llp) * XDR u_quad_t */ bool_t -xdr_u_quad_t(xdrs, ullp) - XDR *xdrs; - u_int64_t *ullp; +xdr_u_quad_t( + XDR *xdrs, + u_int64_t *ullp) { return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp)); } diff --git a/libtirpc/src/xdr_array.c b/libtirpc/src/xdr_array.c index f932efe..0f68b9d 100644 --- a/libtirpc/src/xdr_array.c +++ b/libtirpc/src/xdr_array.c @@ -58,13 +58,13 @@ * xdr procedure to call to handle each element of the array. */ bool_t -xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc) - XDR *xdrs; - caddr_t *addrp; /* array pointer */ - u_int *sizep; /* number of elements */ - u_int maxsize; /* max numberof elements */ - u_int elsize; /* size in bytes of each element */ - xdrproc_t elproc; /* xdr routine to handle each element */ +xdr_array( + XDR *xdrs, + caddr_t *addrp, /* array pointer */ + u_int *sizep, /* number of elements */ + u_int maxsize, /* max numberof elements */ + u_int elsize, /* size in bytes of each element */ + xdrproc_t elproc) /* xdr routine to handle each element */ { u_int i; caddr_t target = *addrp; @@ -136,12 +136,12 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc) * > xdr_elem: routine to XDR each element */ bool_t -xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem) - XDR *xdrs; - char *basep; - u_int nelem; - u_int elemsize; - xdrproc_t xdr_elem; +xdr_vector( + XDR *xdrs, + char *basep, + u_int nelem, + u_int elemsize, + xdrproc_t xdr_elem) { u_int i; char *elptr; diff --git a/libtirpc/src/xdr_float.c b/libtirpc/src/xdr_float.c index 18551f2..095236e 100644 --- a/libtirpc/src/xdr_float.c +++ b/libtirpc/src/xdr_float.c @@ -92,9 +92,9 @@ static struct sgl_limits { #endif /* vax */ bool_t -xdr_float(xdrs, fp) - XDR *xdrs; - float *fp; +xdr_float( + XDR *xdrs, + float *fp) { #ifndef IEEEFP struct ieee_single is; @@ -194,9 +194,9 @@ static struct dbl_limits { bool_t -xdr_double(xdrs, dp) - XDR *xdrs; - double *dp; +xdr_double( + XDR *xdrs, + double *dp) { #ifdef IEEEFP int32_t *i32p; diff --git a/libtirpc/src/xdr_mem.c b/libtirpc/src/xdr_mem.c index f2c6f30..59a2ac0 100644 --- a/libtirpc/src/xdr_mem.c +++ b/libtirpc/src/xdr_mem.c @@ -93,11 +93,11 @@ static const struct xdr_ops xdrmem_ops_unaligned = { * memory buffer. */ void -xdrmem_create(xdrs, addr, size, op) - XDR *xdrs; - char *addr; - u_int size; - enum xdr_op op; +xdrmem_create( + XDR *xdrs, + char *addr, + u_int size, + enum xdr_op op) { xdrs->x_op = op; @@ -109,16 +109,15 @@ xdrmem_create(xdrs, addr, size, op) /*ARGSUSED*/ static void -xdrmem_destroy(xdrs) - XDR *xdrs; +xdrmem_destroy(XDR *xdrs) { } static bool_t -xdrmem_getlong_aligned(xdrs, lp) - XDR *xdrs; - long *lp; +xdrmem_getlong_aligned( + XDR *xdrs, + long *lp) { if (xdrs->x_handy < sizeof(int32_t)) @@ -130,9 +129,9 @@ xdrmem_getlong_aligned(xdrs, lp) } static bool_t -xdrmem_putlong_aligned(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrmem_putlong_aligned( + XDR *xdrs, + const long *lp) { if (xdrs->x_handy < sizeof(int32_t)) @@ -144,9 +143,9 @@ xdrmem_putlong_aligned(xdrs, lp) } static bool_t -xdrmem_getlong_unaligned(xdrs, lp) - XDR *xdrs; - long *lp; +xdrmem_getlong_unaligned( + XDR *xdrs, + long *lp) { u_int32_t l; @@ -160,9 +159,9 @@ xdrmem_getlong_unaligned(xdrs, lp) } static bool_t -xdrmem_putlong_unaligned(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrmem_putlong_unaligned( + XDR *xdrs, + const long *lp) { u_int32_t l; @@ -176,10 +175,10 @@ xdrmem_putlong_unaligned(xdrs, lp) } static bool_t -xdrmem_getbytes(xdrs, addr, len) - XDR *xdrs; - char *addr; - u_int len; +xdrmem_getbytes( + XDR *xdrs, + char *addr, + u_int len) { if (xdrs->x_handy < len) @@ -191,10 +190,10 @@ xdrmem_getbytes(xdrs, addr, len) } static bool_t -xdrmem_putbytes(xdrs, addr, len) - XDR *xdrs; - const char *addr; - u_int len; +xdrmem_putbytes( + XDR *xdrs, + const char *addr, + u_int len) { if (xdrs->x_handy < len) @@ -206,8 +205,7 @@ xdrmem_putbytes(xdrs, addr, len) } static u_int -xdrmem_getpos(xdrs) - XDR *xdrs; +xdrmem_getpos(XDR *xdrs) { /* XXX w/64-bit pointers, u_int not enough! */ @@ -215,9 +213,9 @@ xdrmem_getpos(xdrs) } static bool_t -xdrmem_setpos(xdrs, pos) - XDR *xdrs; - u_int pos; +xdrmem_setpos( + XDR *xdrs, + u_int pos) { char *newaddr = xdrs->x_base + pos; char *lastaddr = (char *)xdrs->x_private + xdrs->x_handy; @@ -230,9 +228,9 @@ xdrmem_setpos(xdrs, pos) } static int32_t * -xdrmem_inline_aligned(xdrs, len) - XDR *xdrs; - u_int len; +xdrmem_inline_aligned( + XDR *xdrs, + u_int len) { int32_t *buf = 0; @@ -246,9 +244,9 @@ xdrmem_inline_aligned(xdrs, len) /* ARGSUSED */ static int32_t * -xdrmem_inline_unaligned(xdrs, len) - XDR *xdrs; - u_int len; +xdrmem_inline_unaligned( + XDR *xdrs, + u_int len) { return (0); diff --git a/libtirpc/src/xdr_rec.c b/libtirpc/src/xdr_rec.c index 37204a2..5fe0cfc 100644 --- a/libtirpc/src/xdr_rec.c +++ b/libtirpc/src/xdr_rec.c @@ -177,15 +177,15 @@ static bool_t realloc_stream(RECSTREAM *, u_int); * calls expect that they take an opaque handle rather than an fd. */ void -xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) - XDR *xdrs; - u_int sendsize; - u_int recvsize; - void *tcp_handle; +xdrrec_create( + XDR *xdrs, + u_int sendsize, + u_int recvsize, + void *tcp_handle, /* like read, but pass it a tcp_handle, not sock */ - int (*readit)(void *, void *, int); + int (*readit)(void *, void *, int), /* like write, but pass it a tcp_handle, not sock */ - int (*writeit)(void *, void *, int); + int (*writeit)(void *, void *, int)) { RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM)); @@ -245,9 +245,9 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) */ static bool_t -xdrrec_getlong(xdrs, lp) - XDR *xdrs; - long *lp; +xdrrec_getlong( + XDR *xdrs, + long *lp) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger); @@ -269,9 +269,9 @@ xdrrec_getlong(xdrs, lp) } static bool_t -xdrrec_putlong(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrrec_putlong( + XDR *xdrs, + const long *lp) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger)); @@ -293,10 +293,10 @@ xdrrec_putlong(xdrs, lp) } static bool_t /* must manage buffers, fragments, and records */ -xdrrec_getbytes(xdrs, addr, len) - XDR *xdrs; - char *addr; - u_int len; +xdrrec_getbytes( + XDR *xdrs, + char *addr, + u_int len) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); u_int current; @@ -321,10 +321,10 @@ xdrrec_getbytes(xdrs, addr, len) } static bool_t -xdrrec_putbytes(xdrs, addr, in_len) - XDR *xdrs; - const char *addr; - u_int in_len; +xdrrec_putbytes( + XDR *xdrs, + const char *addr, + u_int in_len) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); size_t current; @@ -348,8 +348,7 @@ xdrrec_putbytes(xdrs, addr, in_len) } static u_int -xdrrec_getpos(xdrs) - XDR *xdrs; +xdrrec_getpos(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; off_t pos = 0; @@ -375,9 +374,9 @@ xdrrec_getpos(xdrs) } static bool_t -xdrrec_setpos(xdrs, pos) - XDR *xdrs; - u_int pos; +xdrrec_setpos( + XDR *xdrs, + u_int pos) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; u_int currpos = xdrrec_getpos(xdrs); @@ -414,8 +413,7 @@ xdrrec_setpos(xdrs, pos) } int32_t * -xdrrec_getoutbase(xdrs) - XDR *xdrs; +xdrrec_getoutbase(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; int32_t *buf = NULL; @@ -436,9 +434,9 @@ xdrrec_getoutbase(xdrs) } static int32_t * -xdrrec_inline(xdrs, len) - XDR *xdrs; - u_int len; +xdrrec_inline( + XDR *xdrs, + u_int len) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; int32_t *buf = NULL; @@ -468,8 +466,7 @@ xdrrec_inline(xdrs, len) } static void -xdrrec_destroy(xdrs) - XDR *xdrs; +xdrrec_destroy(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; @@ -487,16 +484,14 @@ xdrrec_destroy(xdrs) * Before reading (deserializing from the stream, one should always call * this procedure to guarantee proper record alignment. */ -void xdrrec_setlastfrag(xdrs) - XDR *xdrs; +void xdrrec_setlastfrag(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); rstrm->last_frag = 1; } bool_t -xdrrec_skiprecord(xdrs) - XDR *xdrs; +xdrrec_skiprecord(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); enum xprt_stat xstat; @@ -530,8 +525,7 @@ xdrrec_skiprecord(xdrs) * after consuming the rest of the current record. */ bool_t -xdrrec_eof(xdrs) - XDR *xdrs; +xdrrec_eof(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); @@ -554,9 +548,9 @@ xdrrec_eof(xdrs) * pipelined procedure calls.) TRUE => immmediate flush to tcp connection. */ bool_t -xdrrec_endofrecord(xdrs, sendnow) - XDR *xdrs; - bool_t sendnow; +xdrrec_endofrecord( + XDR *xdrs, + bool_t sendnow) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); u_long len; /* fragment length */ @@ -580,10 +574,10 @@ xdrrec_endofrecord(xdrs, sendnow) * Return true if a record is available in the buffer, false if not. */ bool_t -__xdrrec_getrec(xdrs, statp, expectdata) - XDR *xdrs; - enum xprt_stat *statp; - bool_t expectdata; +__xdrrec_getrec( + XDR *xdrs, + enum xprt_stat *statp, + bool_t expectdata) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); int n; @@ -662,9 +656,9 @@ __xdrrec_getrec(xdrs, statp, expectdata) } bool_t -__xdrrec_setnonblock(xdrs, maxrec) - XDR *xdrs; - int maxrec; +__xdrrec_setnonblock( + XDR *xdrs, + int maxrec) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); @@ -676,8 +670,7 @@ __xdrrec_setnonblock(xdrs, maxrec) } bool_t -__xdrrec_setblock(xdrs) - XDR *xdrs; +__xdrrec_setblock(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); @@ -688,9 +681,9 @@ __xdrrec_setblock(xdrs) * Internal useful routines */ static bool_t -flush_out(rstrm, eor) - RECSTREAM *rstrm; - bool_t eor; +flush_out( + RECSTREAM *rstrm, + bool_t eor) { u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; u_int32_t len = (u_int32_t)(PtrToUlong(rstrm->out_finger) - @@ -708,8 +701,7 @@ flush_out(rstrm, eor) } static bool_t /* knows nothing about records! Only about input buffers */ -fill_input_buf(rstrm) - RECSTREAM *rstrm; +fill_input_buf(RECSTREAM *rstrm) { char *where; u_int32_t i; @@ -731,10 +723,10 @@ fill_input_buf(rstrm) } static bool_t /* knows nothing about records! Only about input buffers */ -get_input_bytes(rstrm, addr, in_len) - RECSTREAM *rstrm; - char *addr; - u_int in_len; +get_input_bytes( + RECSTREAM *rstrm, + char *addr, + u_int in_len) { size_t current; size_t len = in_len; @@ -765,8 +757,7 @@ get_input_bytes(rstrm, addr, in_len) } static bool_t /* next two bytes of the input stream are treated as a header */ -set_input_fragment(rstrm) - RECSTREAM *rstrm; +set_input_fragment(RECSTREAM *rstrm) { u_int32_t header; @@ -791,9 +782,9 @@ set_input_fragment(rstrm) } static bool_t /* consumes input bytes; knows nothing about records! */ -skip_input_bytes(rstrm, cnt) - RECSTREAM *rstrm; - u_int cnt; +skip_input_bytes( + RECSTREAM *rstrm, + u_int cnt) { u_int32_t current; @@ -813,8 +804,7 @@ skip_input_bytes(rstrm, cnt) } static u_int -fix_buf_size(s) - u_int s; +fix_buf_size(u_int s) { if (s < 100) @@ -826,9 +816,9 @@ fix_buf_size(s) * Reallocate the input buffer for a non-block stream. */ static bool_t -realloc_stream(rstrm, size) - RECSTREAM *rstrm; - u_int size; +realloc_stream( + RECSTREAM *rstrm, + u_int size) { ptrdiff_t diff; char *buf; diff --git a/libtirpc/src/xdr_reference.c b/libtirpc/src/xdr_reference.c index cb43cba..601a27a 100644 --- a/libtirpc/src/xdr_reference.c +++ b/libtirpc/src/xdr_reference.c @@ -59,11 +59,11 @@ * proc is the routine to handle the referenced structure. */ bool_t -xdr_reference(xdrs, pp, size, proc) - XDR *xdrs; - caddr_t *pp; /* the pointer to work on */ - u_int size; /* size of the object pointed to */ - xdrproc_t proc; /* xdr routine to handle the object */ +xdr_reference( + XDR *xdrs, + caddr_t *pp, /* the pointer to work on */ + u_int size, /* size of the object pointed to */ + xdrproc_t proc) /* xdr routine to handle the object */ { caddr_t loc = *pp; bool_t stat; @@ -116,11 +116,11 @@ xdr_reference(xdrs, pp, size, proc) * */ 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; diff --git a/libtirpc/src/xdr_sizeof.c b/libtirpc/src/xdr_sizeof.c index 81278db..69243c1 100644 --- a/libtirpc/src/xdr_sizeof.c +++ b/libtirpc/src/xdr_sizeof.c @@ -122,9 +122,9 @@ x_destroy(XDR *xdrs) } unsigned long -xdr_sizeof(func, data) - xdrproc_t func; - void *data; +xdr_sizeof( + xdrproc_t func, + void *data) { XDR x; struct xdr_ops ops; diff --git a/libtirpc/src/xdr_stdio.c b/libtirpc/src/xdr_stdio.c index 40bddfa..4052860 100644 --- a/libtirpc/src/xdr_stdio.c +++ b/libtirpc/src/xdr_stdio.c @@ -77,10 +77,10 @@ static const struct xdr_ops xdrstdio_ops = { * Operation flag is set to op. */ void -xdrstdio_create(xdrs, file, op) - XDR *xdrs; - FILE *file; - enum xdr_op op; +xdrstdio_create( + XDR *xdrs, + FILE *file, + enum xdr_op op) { xdrs->x_op = op; @@ -95,17 +95,16 @@ xdrstdio_create(xdrs, file, op) * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create. */ static void -xdrstdio_destroy(xdrs) - XDR *xdrs; +xdrstdio_destroy(XDR *xdrs) { (void)fflush((FILE *)xdrs->x_private); /* XXX: should we close the file ?? */ } static bool_t -xdrstdio_getlong(xdrs, lp) - XDR *xdrs; - long *lp; +xdrstdio_getlong( + XDR *xdrs, + long *lp) { if (fread(lp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1) @@ -115,9 +114,9 @@ xdrstdio_getlong(xdrs, lp) } static bool_t -xdrstdio_putlong(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrstdio_putlong( + XDR *xdrs, + const long *lp) { long mycopy = (long)htonl((u_int32_t)*lp); @@ -127,10 +126,10 @@ xdrstdio_putlong(xdrs, lp) } static bool_t -xdrstdio_getbytes(xdrs, addr, len) - XDR *xdrs; - char *addr; - u_int len; +xdrstdio_getbytes( + XDR *xdrs, + char *addr, + u_int len) { if ((len != 0) && (fread(addr, (size_t)len, 1, (FILE *)xdrs->x_private) != 1)) @@ -139,10 +138,10 @@ xdrstdio_getbytes(xdrs, addr, len) } static bool_t -xdrstdio_putbytes(xdrs, addr, len) - XDR *xdrs; - const char *addr; - u_int len; +xdrstdio_putbytes( + XDR *xdrs, + const char *addr, + u_int len) { if ((len != 0) && (fwrite(addr, (size_t)len, 1, @@ -152,17 +151,16 @@ xdrstdio_putbytes(xdrs, addr, len) } static u_int -xdrstdio_getpos(xdrs) - XDR *xdrs; +xdrstdio_getpos(XDR *xdrs) { return ((u_int) ftell((FILE *)xdrs->x_private)); } static bool_t -xdrstdio_setpos(xdrs, pos) - XDR *xdrs; - u_int pos; +xdrstdio_setpos( + XDR *xdrs, + u_int pos) { return ((fseek((FILE *)xdrs->x_private, (long)pos, 0) < 0) ? @@ -171,9 +169,9 @@ xdrstdio_setpos(xdrs, pos) /* ARGSUSED */ static int32_t * -xdrstdio_inline(xdrs, len) - XDR *xdrs; - u_int len; +xdrstdio_inline( + XDR *xdrs, + u_int len) { /* -- 2.45.4

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever