Date: Tue, 22 Sep 2015 20:32:50 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r288126 - in projects/clang370-import: contrib/elftoolchain/addr2line lib/libc/resolv lib/libc/rpc sys/arm/arm sys/arm64/arm64 sys/arm64/cavium sys/cam/ctl sys/cam/scsi sys/dev/ahci sys... Message-ID: <201509222032.t8MKWoMR029106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Sep 22 20:32:49 2015 New Revision: 288126 URL: https://svnweb.freebsd.org/changeset/base/288126 Log: Merge ^/head r288100 through r288125. Modified: projects/clang370-import/contrib/elftoolchain/addr2line/addr2line.c projects/clang370-import/lib/libc/resolv/res_debug.c projects/clang370-import/lib/libc/resolv/res_init.c projects/clang370-import/lib/libc/resolv/res_mkupdate.c projects/clang370-import/lib/libc/resolv/res_send.c projects/clang370-import/lib/libc/rpc/auth_unix.c projects/clang370-import/lib/libc/rpc/authdes_prot.c projects/clang370-import/lib/libc/rpc/authunix_prot.c projects/clang370-import/lib/libc/rpc/bindresvport.c projects/clang370-import/lib/libc/rpc/clnt_bcast.c projects/clang370-import/lib/libc/rpc/clnt_perror.c projects/clang370-import/lib/libc/rpc/clnt_raw.c projects/clang370-import/lib/libc/rpc/clnt_simple.c projects/clang370-import/lib/libc/rpc/clnt_vc.c projects/clang370-import/lib/libc/rpc/des_crypt.c projects/clang370-import/lib/libc/rpc/getnetconfig.c projects/clang370-import/lib/libc/rpc/getnetpath.c projects/clang370-import/lib/libc/rpc/getrpcent.c projects/clang370-import/lib/libc/rpc/getrpcport.c projects/clang370-import/lib/libc/rpc/mt_misc.c projects/clang370-import/lib/libc/rpc/netname.c projects/clang370-import/lib/libc/rpc/netnamer.c projects/clang370-import/lib/libc/rpc/pmap_getmaps.c projects/clang370-import/lib/libc/rpc/pmap_getport.c projects/clang370-import/lib/libc/rpc/pmap_prot.c projects/clang370-import/lib/libc/rpc/pmap_prot2.c projects/clang370-import/lib/libc/rpc/pmap_rmt.c projects/clang370-import/lib/libc/rpc/rpc_callmsg.c projects/clang370-import/lib/libc/rpc/rpc_generic.c projects/clang370-import/lib/libc/rpc/rpc_prot.c projects/clang370-import/lib/libc/rpc/rpc_soc.c projects/clang370-import/lib/libc/rpc/rpcb_clnt.c projects/clang370-import/lib/libc/rpc/rpcb_prot.c projects/clang370-import/lib/libc/rpc/rpcb_st_xdr.c projects/clang370-import/lib/libc/rpc/svc_auth.c projects/clang370-import/lib/libc/rpc/svc_auth_unix.c projects/clang370-import/lib/libc/rpc/svc_generic.c projects/clang370-import/lib/libc/rpc/svc_raw.c projects/clang370-import/lib/libc/rpc/svc_run.c projects/clang370-import/lib/libc/rpc/svc_simple.c projects/clang370-import/sys/arm/arm/stdatomic.c projects/clang370-import/sys/arm64/arm64/exception.S projects/clang370-import/sys/arm64/cavium/thunder_pcie_pem.c projects/clang370-import/sys/cam/ctl/ctl.c projects/clang370-import/sys/cam/ctl/ctl_backend_block.c projects/clang370-import/sys/cam/ctl/ctl_private.h projects/clang370-import/sys/cam/scsi/scsi_all.h projects/clang370-import/sys/dev/ahci/ahci_pci.c projects/clang370-import/sys/dev/drm2/drm_lock.c projects/clang370-import/sys/kern/vfs_bio.c projects/clang370-import/sys/netinet/toecore.c projects/clang370-import/sys/vm/vm_page.c projects/clang370-import/sys/vm/vm_page.h projects/clang370-import/sys/x86/iommu/intel_ctx.c projects/clang370-import/usr.sbin/acpi/acpiconf/acpiconf.8 projects/clang370-import/usr.sbin/ndiscvt/inf.c projects/clang370-import/usr.sbin/ndiscvt/inf.h Directory Properties: projects/clang370-import/ (props changed) projects/clang370-import/contrib/elftoolchain/ (props changed) projects/clang370-import/lib/libc/ (props changed) projects/clang370-import/sys/ (props changed) projects/clang370-import/usr.sbin/ndiscvt/ (props changed) Modified: projects/clang370-import/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- projects/clang370-import/contrib/elftoolchain/addr2line/addr2line.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/contrib/elftoolchain/addr2line/addr2line.c Tue Sep 22 20:32:49 2015 (r288126) @@ -248,7 +248,13 @@ translate(Dwarf_Debug dbg, const char* a continue; } - if (dwarf_srclines(die, &lbuf, &lcount, &de) != DW_DLV_OK) { + switch (dwarf_srclines(die, &lbuf, &lcount, &de)) { + case DW_DLV_OK: + break; + case DW_DLV_NO_ENTRY: + /* If one CU lacks debug info, just skip it. */ + continue; + default: warnx("dwarf_srclines: %s", dwarf_errmsg(de)); goto out; } Modified: projects/clang370-import/lib/libc/resolv/res_debug.c ============================================================================== --- projects/clang370-import/lib/libc/resolv/res_debug.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/resolv/res_debug.c Tue Sep 22 20:32:49 2015 (r288126) @@ -367,11 +367,8 @@ p_cdname(const u_char *cp, const u_char length supplied). */ const u_char * -p_fqnname(cp, msg, msglen, name, namelen) - const u_char *cp, *msg; - int msglen; - char *name; - int namelen; +p_fqnname(const u_char *cp, const u_char *msg, int msglen, char *name, + int namelen) { int n, newlen; @@ -758,8 +755,7 @@ static unsigned int poweroften[10] = {1, /*% takes an XeY precision/size value, returns a string representation. */ static const char * -precsize_ntoa(prec) - u_int8_t prec; +precsize_ntoa(u_int8_t prec) { char *retbuf = precsize_ntoa_retbuf; unsigned long val; @@ -912,9 +908,7 @@ latlon2ul(const char **latlonstrptr, int * converts a zone file representation in a string to an RDATA on-the-wire * representation. */ int -loc_aton(ascii, binary) - const char *ascii; - u_char *binary; +loc_aton(const char *ascii, u_char *binary) { const char *cp, *maxcp; u_char *bcp; @@ -1023,9 +1017,7 @@ loc_aton(ascii, binary) /*% takes an on-the-wire LOC RR and formats it in a human readable format. */ const char * -loc_ntoa(binary, ascii) - const u_char *binary; - char *ascii; +loc_ntoa(const u_char *binary, char *ascii) { static const char *error = "?"; static char tmpbuf[sizeof Modified: projects/clang370-import/lib/libc/resolv/res_init.c ============================================================================== --- projects/clang370-import/lib/libc/resolv/res_init.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/resolv/res_init.c Tue Sep 22 20:32:49 2015 (r288126) @@ -718,8 +718,7 @@ res_setoptions(res_state statp, const ch #ifdef RESOLVSORT /* XXX - should really support CIDR which means explicit masks always. */ static u_int32_t -net_mask(in) /*!< XXX - should really use system's version of this */ - struct in_addr in; +net_mask(struct in_addr in) /*!< XXX - should really use system's version of this */ { u_int32_t i = ntohl(in.s_addr); Modified: projects/clang370-import/lib/libc/resolv/res_mkupdate.c ============================================================================== --- projects/clang370-import/lib/libc/resolv/res_mkupdate.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/resolv/res_mkupdate.c Tue Sep 22 20:32:49 2015 (r288126) @@ -973,7 +973,7 @@ struct valuelist { static struct valuelist *servicelist, *protolist; static void -res_buildservicelist() { +res_buildservicelist(void) { struct servent *sp; struct valuelist *slp; Modified: projects/clang370-import/lib/libc/resolv/res_send.c ============================================================================== --- projects/clang370-import/lib/libc/resolv/res_send.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/resolv/res_send.c Tue Sep 22 20:32:49 2015 (r288126) @@ -574,8 +574,7 @@ res_nsend(res_state statp, /* Private */ static int -get_salen(sa) - const struct sockaddr *sa; +get_salen(const struct sockaddr *sa) { #ifdef HAVE_SA_LEN @@ -596,9 +595,7 @@ get_salen(sa) * pick appropriate nsaddr_list for use. see res_init() for initialization. */ static struct sockaddr * -get_nsaddr(statp, n) - res_state statp; - size_t n; +get_nsaddr(res_state statp, size_t n) { if (!statp->nsaddr_list[n].sin_family && EXT(statp).ext) { Modified: projects/clang370-import/lib/libc/rpc/auth_unix.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/auth_unix.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/auth_unix.c Tue Sep 22 20:32:49 2015 (r288126) @@ -91,12 +91,7 @@ struct audata { * Returns an auth handle with the given stuff in it. */ AUTH * -authunix_create(machname, uid, gid, len, aup_gids) - char *machname; - u_int uid; - u_int gid; - int len; - u_int *aup_gids; +authunix_create(char *machname, u_int uid, u_int gid, int len, u_int *aup_gids) { struct authunix_parms aup; char mymem[MAX_AUTH_BYTES]; @@ -182,7 +177,7 @@ authunix_create(machname, uid, gid, len, * syscalls. */ AUTH * -authunix_create_default() +authunix_create_default(void) { AUTH *auth; int ngids; @@ -218,16 +213,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) - AUTH *auth; - XDR *xdrs; +authunix_marshal(AUTH *auth, XDR *xdrs) { struct audata *au; @@ -239,9 +231,7 @@ authunix_marshal(auth, xdrs) } static bool_t -authunix_validate(auth, verf) - AUTH *auth; - struct opaque_auth *verf; +authunix_validate(AUTH *auth, struct opaque_auth *verf) { struct audata *au; XDR xdrs; @@ -317,8 +307,7 @@ done: } static void -authunix_destroy(auth) - AUTH *auth; +authunix_destroy(AUTH *auth) { struct audata *au; @@ -343,8 +332,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; @@ -363,7 +351,7 @@ marshal_new_auth(auth) } static struct auth_ops * -authunix_ops() +authunix_ops(void) { static struct auth_ops ops; Modified: projects/clang370-import/lib/libc/rpc/authdes_prot.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/authdes_prot.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/authdes_prot.c Tue Sep 22 20:32:49 2015 (r288126) @@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$"); #define ATTEMPT(xdr_op) if (!(xdr_op)) return (FALSE) bool_t -xdr_authdes_cred(xdrs, cred) - XDR *xdrs; - struct authdes_cred *cred; +xdr_authdes_cred(XDR *xdrs, struct authdes_cred *cred) { enum authdes_namekind *padc_namekind = &cred->adc_namekind; /* @@ -78,9 +76,7 @@ xdr_authdes_cred(xdrs, cred) bool_t -xdr_authdes_verf(xdrs, verf) - XDR *xdrs; - struct authdes_verf *verf; +xdr_authdes_verf(XDR *xdrs, struct authdes_verf *verf) { /* * Unrolled xdr Modified: projects/clang370-import/lib/libc/rpc/authunix_prot.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/authunix_prot.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/authunix_prot.c Tue Sep 22 20:32:49 2015 (r288126) @@ -55,9 +55,7 @@ __FBSDID("$FreeBSD$"); * 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) { u_int **paup_gids; Modified: projects/clang370-import/lib/libc/rpc/bindresvport.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/bindresvport.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/bindresvport.c Tue Sep 22 20:32:49 2015 (r288126) @@ -61,9 +61,7 @@ __FBSDID("$FreeBSD$"); * 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); } @@ -72,9 +70,7 @@ bindresvport(sd, sin) * 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) { int old, error, af; struct sockaddr_storage myaddr; Modified: projects/clang370-import/lib/libc/rpc/clnt_bcast.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/clnt_bcast.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/clnt_bcast.c Tue Sep 22 20:32:49 2015 (r288126) @@ -225,21 +225,26 @@ __rpc_broadenable(int af, int s, struct return 0; } - +/* + * rpc_broadcast_exp() + * + * prog - program number + * vers - version number + * proc - procedure number + * xargs - xdr routine for args + * argsp - pointer to args + * xresults - xdr routine for results + * resultsp - pointer to results + * eachresult - call with each result obtained + * inittime - how long to wait initially + * waittime - maximum time to wait + * nettype - transport type + */ 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, rpcvers_t vers, rpcproc_t proc, + xdrproc_t xargs, caddr_t argsp, xdrproc_t xresults, caddr_t resultsp, + resultproc_t eachresult, int inittime, int waittime, + const char *nettype) { enum clnt_stat stat = RPC_SUCCESS; /* Return status */ XDR xdr_stream; /* XDR stream */ @@ -649,19 +654,23 @@ done_broad: return (stat); } - +/* + * rpc_broadcast() + * + * prog - program number + * vers - version number + * proc - procedure number + * xargs - xdr routine for args + * argsp - pointer to args + * xresults - xdr routine for results + * resultsp - pointer to results + * eachresult - call with each result obtained + * nettype - transport type + */ 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, rpcvers_t vers, rpcproc_t proc, xdrproc_t xargs, + caddr_t argsp, xdrproc_t xresults, caddr_t resultsp, + resultproc_t eachresult, const char *nettype) { enum clnt_stat dummy; Modified: projects/clang370-import/lib/libc/rpc/clnt_perror.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/clnt_perror.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/clnt_perror.c Tue Sep 22 20:32:49 2015 (r288126) @@ -61,7 +61,7 @@ static char *auth_errmsg(enum auth_stat) #define CLNT_PERROR_BUFLEN 256 static char * -_buf() +_buf(void) { if (buf == 0) @@ -73,9 +73,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; @@ -180,9 +178,7 @@ clnt_sperror(rpch, s) } void -clnt_perror(rpch, s) - CLIENT *rpch; - const char *s; +clnt_perror(CLIENT *rpch, const char *s) { assert(rpch != NULL); @@ -217,8 +213,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; @@ -230,16 +225,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; size_t len, i; @@ -291,8 +284,7 @@ clnt_spcreateerror(s) } void -clnt_pcreateerror(s) - const char *s; +clnt_pcreateerror(const char *s) { assert(s != NULL); @@ -319,8 +311,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; Modified: projects/clang370-import/lib/libc/rpc/clnt_raw.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/clnt_raw.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/clnt_raw.c Tue Sep 22 20:32:49 2015 (r288126) @@ -87,9 +87,7 @@ static struct clnt_ops *clnt_raw_ops(voi * 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; @@ -142,14 +140,8 @@ 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; @@ -240,19 +232,14 @@ 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; @@ -271,30 +258,25 @@ 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) { } static struct clnt_ops * -clnt_raw_ops() +clnt_raw_ops(void) { static struct clnt_ops ops; Modified: projects/clang370-import/lib/libc/rpc/clnt_simple.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/clnt_simple.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/clnt_simple.c Tue Sep 22 20:32:49 2015 (r288126) @@ -107,17 +107,19 @@ rpc_call_key_init(void) * the future calls to same prog, vers, host and nettype combination. * * The total time available is 25 seconds. + * + * host - host name + * prognum - program number + * versnum - version number + * procnum - procedure number + * inproc, outproc - in/out XDR procedures + * in, out - recv/send data + * nettype - nettype */ 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, const rpcprog_t prognum, const rpcvers_t versnum, + const rpcproc_t procnum, const xdrproc_t inproc, const char *in, + const xdrproc_t outproc, char *out, const char *nettype) { struct rpc_call_private *rcp = (struct rpc_call_private *) 0; enum clnt_stat clnt_stat; Modified: projects/clang370-import/lib/libc/rpc/clnt_vc.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/clnt_vc.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/clnt_vc.c Tue Sep 22 20:32:49 2015 (r288126) @@ -153,15 +153,17 @@ static const char __no_mem_str[] = "out * set this something more useful. * * fd should be an open socket + * + * fd - open file descriptor + * raddr - servers address + * prog - program number + * vers - version number + * sendsz - buffer send size + * recvsz - buffer recv size */ CLIENT * -clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz) - 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 */ +clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, + const rpcvers_t vers, u_int sendsz, u_int recvsz) { CLIENT *cl; /* client handle */ struct ct_data *ct = NULL; /* client handle */ @@ -311,14 +313,8 @@ 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); @@ -461,9 +457,7 @@ call_again: } 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; @@ -475,10 +469,7 @@ 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; @@ -507,16 +498,12 @@ 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; @@ -644,8 +631,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; @@ -684,10 +670,7 @@ 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; socklen_t sal; @@ -741,10 +724,7 @@ read_vc(ctp, buf, len) } static int -write_vc(ctp, buf, len) - void *ctp; - void *buf; - int len; +write_vc(void *ctp, void *buf, int len) { struct sockaddr sa; socklen_t sal; @@ -775,7 +755,7 @@ write_vc(ctp, buf, len) } static struct clnt_ops * -clnt_vc_ops() +clnt_vc_ops(void) { static struct clnt_ops ops; sigset_t mask, newmask; @@ -803,18 +783,14 @@ 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); } static int -__msgread(sock, buf, cnt) - int sock; - void *buf; - size_t cnt; +__msgread(int sock, void *buf, size_t cnt) { struct iovec iov[1]; struct msghdr msg; @@ -839,10 +815,7 @@ __msgread(sock, buf, cnt) } static int -__msgwrite(sock, buf, cnt) - int sock; - void *buf; - size_t cnt; +__msgwrite(int sock, void *buf, size_t cnt) { struct iovec iov[1]; struct msghdr msg; Modified: projects/clang370-import/lib/libc/rpc/des_crypt.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/des_crypt.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/des_crypt.c Tue Sep 22 20:32:49 2015 (r288126) @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)des_crypt.c __FBSDID("$FreeBSD$"); static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * ); -int (*__des_crypt_LOCAL)() = 0; +int (*__des_crypt_LOCAL)(char *, unsigned, struct desparams *) = 0; extern int _des_crypt_call(char *, int, struct desparams *); /* * Copy 8 bytes Modified: projects/clang370-import/lib/libc/rpc/getnetconfig.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/getnetconfig.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/getnetconfig.c Tue Sep 22 20:32:49 2015 (r288126) @@ -147,7 +147,7 @@ nc_key_init(void) #define MAXNETCONFIGLINE 1000 static int * -__nc_error() +__nc_error(void) { static int nc_error = 0; int *nc_addr; @@ -194,7 +194,7 @@ __nc_error() * the netconfig database is not present). */ void * -setnetconfig() +setnetconfig(void) { struct netconfig_vars *nc_vars; @@ -240,8 +240,7 @@ setnetconfig() */ struct netconfig * -getnetconfig(handlep) -void *handlep; +getnetconfig(void *handlep) { struct netconfig_vars *ncp = (struct netconfig_vars *)handlep; char *stringp; /* tmp string pointer */ @@ -378,8 +377,7 @@ void *handlep; * previously). */ int -endnetconfig(handlep) -void *handlep; +endnetconfig(void *handlep) { struct netconfig_vars *nc_handlep = (struct netconfig_vars *)handlep; @@ -444,8 +442,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 */ @@ -536,8 +533,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 */ @@ -558,12 +554,13 @@ freenetconfigent(netconfigp) * Note that we modify stringp (putting NULLs after tokens) and * we set the ncp's string field pointers to point to these tokens within * stringp. + * + * stringp - string to parse + * ncp - where to put results */ static int -parse_ncp(stringp, ncp) -char *stringp; /* string to parse */ -struct netconfig *ncp; /* where to put results */ +parse_ncp(char *stringp, struct netconfig *ncp) { char *tokenp; /* for processing tokens */ char *lasts; @@ -655,7 +652,7 @@ struct netconfig *ncp; /* where to put r * Returns a string describing the reason for failure. */ char * -nc_sperror() +nc_sperror(void) { const char *message; @@ -686,8 +683,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()); } @@ -696,8 +692,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; Modified: projects/clang370-import/lib/libc/rpc/getnetpath.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/getnetpath.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/getnetpath.c Tue Sep 22 20:32:49 2015 (r288126) @@ -82,7 +82,7 @@ char *_get_next_token(char *, int); */ void * -setnetpath() +setnetpath(void) { struct netpath_vars *np_sessionp; /* this session's variables */ @@ -141,8 +141,7 @@ failed: */ 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 */ @@ -197,8 +196,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; @@ -231,12 +229,12 @@ endnetpath(handlep) * Returns pointer to the rest-of-the-string after the current token. * The token itself starts at arg, and we null terminate it. We return NULL * if either the arg is empty, or if this is the last token. + * + * npp - string + * token - char to parse string for */ - char * -_get_next_token(npp, token) -char *npp; /* string */ -int token; /* char to parse string for */ +_get_next_token(char *npp, int token) { char *cp; /* char pointer */ char *np; /* netpath pointer */ Modified: projects/clang370-import/lib/libc/rpc/getrpcent.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/getrpcent.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/getrpcent.c Tue Sep 22 20:32:49 2015 (r288126) @@ -989,7 +989,7 @@ getrpcbynumber(int number) } struct rpcent * -getrpcent() +getrpcent(void) { union key key; @@ -1023,7 +1023,7 @@ setrpcent(int stayopen) } void -endrpcent() +endrpcent(void) { #ifdef NS_CACHING static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( Modified: projects/clang370-import/lib/libc/rpc/getrpcport.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/getrpcport.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/getrpcport.c Tue Sep 22 20:32:49 2015 (r288126) @@ -53,9 +53,7 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.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; Modified: projects/clang370-import/lib/libc/rpc/mt_misc.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/mt_misc.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/mt_misc.c Tue Sep 22 20:32:49 2015 (r288126) @@ -93,7 +93,7 @@ rce_key_init(void) } struct rpc_createerr * -__rpc_createerr() +__rpc_createerr(void) { struct rpc_createerr *rce_addr = 0; Modified: projects/clang370-import/lib/libc/rpc/netname.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/netname.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/netname.c Tue Sep 22 20:32:49 2015 (r288126) @@ -79,8 +79,7 @@ static char *OPSYS = "unix"; * Figure out my fully qualified network name */ int -getnetname(name) - char name[MAXNETNAMELEN+1]; +getnetname(char name[MAXNETNAMELEN+1]) { uid_t uid; @@ -97,10 +96,7 @@ 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[MAXNETNAMELEN + 1], const uid_t uid, const char *domain) { char *dfltdom; @@ -122,10 +118,7 @@ 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[MAXNETNAMELEN + 1], const char *host, const char *domain) { char *dfltdom; char hostname[MAXHOSTNAMELEN+1]; Modified: projects/clang370-import/lib/libc/rpc/netnamer.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/netnamer.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/netnamer.c Tue Sep 22 20:32:49 2015 (r288126) @@ -68,12 +68,8 @@ 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[MAXNETNAMELEN + 1], uid_t *uidp, gid_t *gidp, + int *gidlenp, gid_t *gidlist) { char *p; int gidlen; @@ -149,9 +145,7 @@ netname2user(netname, uidp, gidp, gidlen */ static int -_getgroups(uname, groups) - char *uname; - gid_t groups[NGRPS]; +_getgroups(char *uname, gid_t groups[NGRPS]) { gid_t ngroups = 0; struct group *grp; @@ -190,10 +184,7 @@ toomany: * Convert network-name to hostname */ int -netname2host(netname, hostname, hostlen) - char netname[MAXNETNAMELEN + 1]; - char *hostname; - int hostlen; +netname2host(char netname[MAXNETNAMELEN + 1], char *hostname, int hostlen) { int err; char valbuf[1024]; @@ -239,8 +230,7 @@ netname2host(netname, hostname, hostlen) * network information service. */ int -getnetid(key, ret) - char *key, *ret; +getnetid(char *key, char *ret) { char buf[1024]; /* big enough */ char *res; Modified: projects/clang370-import/lib/libc/rpc/pmap_getmaps.c ============================================================================== --- projects/clang370-import/lib/libc/rpc/pmap_getmaps.c Tue Sep 22 19:57:31 2015 (r288125) +++ projects/clang370-import/lib/libc/rpc/pmap_getmaps.c Tue Sep 22 20:32:49 2015 (r288126) @@ -70,8 +70,7 @@ __FBSDID("$FreeBSD$"); * Calls the pmap service remotely to do get the maps. */ struct pmaplist * -pmap_getmaps(address) - struct sockaddr_in *address; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509222032.t8MKWoMR029106>