diff options
-rw-r--r-- | usr.sbin/amd/rpcx/amq_clnt.c | 29 | ||||
-rw-r--r-- | usr.sbin/amd/rpcx/amq_xdr.c | 19 | ||||
-rw-r--r-- | usr.sbin/amd/rpcx/nfs_prot_xdr.c | 14 |
3 files changed, 41 insertions, 21 deletions
diff --git a/usr.sbin/amd/rpcx/amq_clnt.c b/usr.sbin/amd/rpcx/amq_clnt.c index 9b0746e582d..959d67fc8d6 100644 --- a/usr.sbin/amd/rpcx/amq_clnt.c +++ b/usr.sbin/amd/rpcx/amq_clnt.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)amq_clnt.c 8.1 (Berkeley) 6/6/93 - * $Id: amq_clnt.c,v 1.3 2002/08/05 07:24:26 pvalchev Exp $ + * $Id: amq_clnt.c,v 1.4 2002/09/10 05:41:28 deraadt Exp $ * */ @@ -51,7 +51,8 @@ amqproc_null_1(void *argp, CLIENT *clnt) static char res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_NULL, xdr_void, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_NULL, xdr_void, argp, xdr_void, + &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return ((void *)&res); @@ -64,7 +65,8 @@ amqproc_mnttree_1(amq_string *argp, CLIENT *clnt) static amq_mount_tree_p res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_MNTTREE, xdr_amq_string, argp, xdr_amq_mount_tree_p, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_MNTTREE, xdr_amq_string, argp, + xdr_amq_mount_tree_p, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); @@ -77,7 +79,8 @@ amqproc_umnt_1(amq_string *argp, CLIENT *clnt) static char res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_UMNT, xdr_amq_string, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_UMNT, xdr_amq_string, argp, + xdr_void, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return ((void *)&res); @@ -90,7 +93,8 @@ amqproc_stats_1(void *argp, CLIENT *clnt) static amq_mount_stats res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_STATS, xdr_void, argp, xdr_amq_mount_stats, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_STATS, xdr_void, argp, + xdr_amq_mount_stats, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); @@ -103,7 +107,8 @@ amqproc_export_1(void *argp, CLIENT *clnt) static amq_mount_tree_list res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_EXPORT, xdr_void, argp, xdr_amq_mount_tree_list, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_EXPORT, xdr_void, argp, + xdr_amq_mount_tree_list, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); @@ -115,7 +120,8 @@ amqproc_setopt_1(amq_setopt *argp, CLIENT *clnt) static int res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_SETOPT, xdr_amq_setopt, argp, xdr_int, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_SETOPT, xdr_amq_setopt, argp, + xdr_int, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); @@ -128,7 +134,8 @@ amqproc_getmntfs_1(void *argp, CLIENT *clnt) static amq_mount_info_list res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_GETMNTFS, xdr_void, argp, xdr_amq_mount_info_list, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_GETMNTFS, xdr_void, argp, + xdr_amq_mount_info_list, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); @@ -141,7 +148,8 @@ amqproc_mount_1(void *argp, CLIENT *clnt) static int res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_MOUNT, xdr_amq_string, argp, xdr_int, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_MOUNT, xdr_amq_string, argp, + xdr_int, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); @@ -154,7 +162,8 @@ amqproc_getvers_1(void *argp, CLIENT *clnt) static amq_string res; bzero((char *)&res, sizeof(res)); - if (clnt_call(clnt, AMQPROC_GETVERS, xdr_void, argp, xdr_amq_string, &res, TIMEOUT) != RPC_SUCCESS) { + if (clnt_call(clnt, AMQPROC_GETVERS, xdr_void, argp, + xdr_amq_string, &res, TIMEOUT) != RPC_SUCCESS) { return (NULL); } return (&res); diff --git a/usr.sbin/amd/rpcx/amq_xdr.c b/usr.sbin/amd/rpcx/amq_xdr.c index 572704657dc..b730eaf4beb 100644 --- a/usr.sbin/amd/rpcx/amq_xdr.c +++ b/usr.sbin/amd/rpcx/amq_xdr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)amq_xdr.c 8.1 (Berkeley) 6/6/93 - * $Id: amq_xdr.c,v 1.3 2002/08/03 08:29:32 pvalchev Exp $ + * $Id: amq_xdr.c,v 1.4 2002/09/10 05:41:28 deraadt Exp $ * */ @@ -97,10 +97,12 @@ xdr_amq_mount_tree(XDR *xdrs, amq_mount_tree *objp) if (!xdr_int(xdrs, &objp->mt_statfs)) { return (FALSE); } - if (!xdr_pointer(xdrs, (char **)&objp->mt_next, sizeof(amq_mount_tree), xdr_amq_mount_tree)) { + if (!xdr_pointer(xdrs, (char **)&objp->mt_next, + sizeof(amq_mount_tree), xdr_amq_mount_tree)) { return (FALSE); } - if (!xdr_pointer(xdrs, (char **)&objp->mt_child, sizeof(amq_mount_tree), xdr_amq_mount_tree)) { + if (!xdr_pointer(xdrs, (char **)&objp->mt_child, + sizeof(amq_mount_tree), xdr_amq_mount_tree)) { return (FALSE); } return (TRUE); @@ -109,7 +111,8 @@ xdr_amq_mount_tree(XDR *xdrs, amq_mount_tree *objp) bool_t xdr_amq_mount_tree_p(XDR *xdrs, amq_mount_tree_p *objp) { - if (!xdr_pointer(xdrs, (char **)objp, sizeof(amq_mount_tree), xdr_amq_mount_tree)) { + if (!xdr_pointer(xdrs, (char **)objp, sizeof(amq_mount_tree), + xdr_amq_mount_tree)) { return (FALSE); } return (TRUE); @@ -145,7 +148,9 @@ xdr_amq_mount_info(XDR *xdrs, amq_mount_info *objp) bool_t xdr_amq_mount_info_list(XDR *xdrs, amq_mount_info_list *objp) { - if (!xdr_array(xdrs, (char **)&objp->amq_mount_info_list_val, (u_int *)&objp->amq_mount_info_list_len, ~0, sizeof(amq_mount_info), xdr_amq_mount_info)) { + if (!xdr_array(xdrs, (char **)&objp->amq_mount_info_list_val, + (u_int *)&objp->amq_mount_info_list_len, ~0, + sizeof(amq_mount_info), xdr_amq_mount_info)) { return (FALSE); } return (TRUE); @@ -154,7 +159,9 @@ xdr_amq_mount_info_list(XDR *xdrs, amq_mount_info_list *objp) bool_t xdr_amq_mount_tree_list(XDR *xdrs, amq_mount_tree_list *objp) { - if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, (u_int *)&objp->amq_mount_tree_list_len, ~0, sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) { + if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, + (u_int *)&objp->amq_mount_tree_list_len, ~0, + sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) { return (FALSE); } return (TRUE); diff --git a/usr.sbin/amd/rpcx/nfs_prot_xdr.c b/usr.sbin/amd/rpcx/nfs_prot_xdr.c index 6d50ed52f20..f647a85ada6 100644 --- a/usr.sbin/amd/rpcx/nfs_prot_xdr.c +++ b/usr.sbin/amd/rpcx/nfs_prot_xdr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)nfs_prot_xdr.c 8.1 (Berkeley) 6/6/93 - * $Id: nfs_prot_xdr.c,v 1.1 1995/10/18 08:47:23 deraadt Exp $ + * $Id: nfs_prot_xdr.c,v 1.2 2002/09/10 05:41:04 deraadt Exp $ * */ @@ -359,7 +359,8 @@ xdr_readokres(xdrs, objp) if (!xdr_fattr(xdrs, &objp->attributes)) { return (FALSE); } - if (!xdr_bytes(xdrs, (char **)&objp->data.data_val, (u_int *)&objp->data.data_len, NFS_MAXDATA)) { + if (!xdr_bytes(xdrs, (char **)&objp->data.data_val, + (u_int *)&objp->data.data_len, NFS_MAXDATA)) { return (FALSE); } return (TRUE); @@ -406,7 +407,8 @@ xdr_writeargs(xdrs, objp) if (!xdr_u_int(xdrs, &objp->totalcount)) { return (FALSE); } - if (!xdr_bytes(xdrs, (char **)&objp->data.data_val, (u_int *)&objp->data.data_len, NFS_MAXDATA)) { + if (!xdr_bytes(xdrs, (char **)&objp->data.data_val, + (u_int *)&objp->data.data_len, NFS_MAXDATA)) { return (FALSE); } return (TRUE); @@ -534,7 +536,8 @@ xdr_entry(xdrs, objp) if (!xdr_nfscookie(xdrs, objp->cookie)) { return (FALSE); } - if (!xdr_pointer(xdrs, (char **)&objp->nextentry, sizeof(entry), xdr_entry)) { + if (!xdr_pointer(xdrs, (char **)&objp->nextentry, + sizeof(entry), xdr_entry)) { return (FALSE); } return (TRUE); @@ -548,7 +551,8 @@ xdr_dirlist(xdrs, objp) XDR *xdrs; dirlist *objp; { - if (!xdr_pointer(xdrs, (char **)&objp->entries, sizeof(entry), xdr_entry)) { + if (!xdr_pointer(xdrs, (char **)&objp->entries, + sizeof(entry), xdr_entry)) { return (FALSE); } if (!xdr_bool(xdrs, &objp->eof)) { |