diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | io/fts.c | 6 | ||||
| -rw-r--r-- | malloc/mcheck.c | 8 | ||||
| -rw-r--r-- | posix/regexec.c | 23 | ||||
| -rw-r--r-- | resolv/res_init.c | 4 | ||||
| -rw-r--r-- | sunrpc/clnt_udp.c | 22 | ||||
| -rw-r--r-- | sunrpc/pmap_rmt.c | 25 | ||||
| -rw-r--r-- | sunrpc/rpcsvc/rusers.x | 24 |
8 files changed, 71 insertions, 59 deletions
diff --git a/ChangeLog b/ChangeLog index 4e2093a512..d08674e478 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2015-10-21 Joseph Myers <joseph@codesourcery.com> + * io/fts.c (fts_open): Convert to prototype-style function + definition. + * malloc/mcheck.c (mcheck): Likewise. + (mcheck_pedantic): Likewise. + * posix/regexec.c (re_search_2_stub): Likewise. Use + internal_function. + (re_search_internal): Likewise. + * resolv/res_init.c [RESOLVSORT] (net_mask): Convert to + prototype-style function definition. + * sunrpc/clnt_udp.c (clntudp_call): Likewise. + * sunrpc/pmap_rmt.c (clnt_broadcast): Likewise. + * sunrpc/rpcsvc/rusers.x (xdr_utmp): Likewise. + (xdr_utmpptr): Likewise. + (xdr_utmparr): Likewise. + (xdr_utmpidle): Likewise. + (xdr_utmpidleptr): Likewise. + (xdr_utmpidlearr): Likewise. + * math/auto-libm-test-in: Add more tests of hypot, j0, j1, jn, log, log10 and log2. * math/auto-libm-test-out: Regenerated. diff --git a/io/fts.c b/io/fts.c index ac1d340da8..f83267611f 100644 --- a/io/fts.c +++ b/io/fts.c @@ -85,10 +85,8 @@ static int fts_safe_changedir (FTS *, FTSENT *, int, const char *) #define BREAD 3 /* fts_read */ FTS * -fts_open(argv, options, compar) - char * const *argv; - int options; - int (*compar) (const FTSENT **, const FTSENT **); +fts_open (char * const *argv, int options, + int (*compar) (const FTSENT **, const FTSENT **)) { FTS *sp; FTSENT *p, *root; diff --git a/malloc/mcheck.c b/malloc/mcheck.c index 6a5f01e293..3dd1c6b467 100644 --- a/malloc/mcheck.c +++ b/malloc/mcheck.c @@ -369,8 +369,8 @@ mabort (enum mcheck_status status) #define malloc_opt_barrier(x) \ ({ __typeof (x) __x = x; __asm ("" : "+m" (__x)); __x; }) -int mcheck (func) -void (*func)(enum mcheck_status); +int +mcheck (void (*func) (enum mcheck_status)) { abortfunc = (func != NULL) ? func : &mabort; @@ -400,8 +400,8 @@ void (*func)(enum mcheck_status); libc_hidden_def (mcheck) #endif -int mcheck_pedantic (func) -void (*func)(enum mcheck_status); +int +mcheck_pedantic (void (*func) (enum mcheck_status)) { int res = mcheck (func); if (res == 0) diff --git a/posix/regexec.c b/posix/regexec.c index 8699e71b30..bbc7a9878f 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -345,12 +345,11 @@ weak_alias (__re_search_2, re_search_2) #endif static int -re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, - stop, ret_len) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int length1, length2, start, range, stop, ret_len; - struct re_registers *regs; +internal_function +re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, + int length1, const char *string2, int length2, int start, + int range, struct re_registers *regs, + int stop, int ret_len) { const char *str; int rval; @@ -606,14 +605,10 @@ re_exec (const char *s) (START + RANGE >= 0 && START + RANGE <= LENGTH) */ static reg_errcode_t -__attribute_warn_unused_result__ -re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch, - eflags) - const regex_t *preg; - const char *string; - int length, start, range, stop, eflags; - size_t nmatch; - regmatch_t pmatch[]; +__attribute_warn_unused_result__ internal_function +re_search_internal (const regex_t *preg, const char *string, int length, + int start, int range, int stop, size_t nmatch, + regmatch_t pmatch[], int eflags) { reg_errcode_t err; const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer; diff --git a/resolv/res_init.c b/resolv/res_init.c index 66561ffac2..c5dc801937 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -554,9 +554,9 @@ res_setoptions(res_state statp, const char *options, const char *source) { #ifdef RESOLVSORT /* XXX - should really support CIDR which means explicit masks always. */ +/* XXX - should really use system's version of this */ 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) { u_int32_t i = ntohl(in.s_addr); diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c index 5653324bf1..a6cf5f1ca7 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -257,14 +257,20 @@ is_network_up (int sock) } static enum clnt_stat -clntudp_call (cl, proc, xargs, argsp, xresults, resultsp, utimeout) - CLIENT *cl; /* client handle */ - u_long 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 */ - struct timeval utimeout; /* seconds to wait before giving up */ +clntudp_call (/* client handle */ + CLIENT *cl, + /* procedure number */ + u_long proc, + /* xdr routine for args */ + xdrproc_t xargs, + /* pointer to args */ + caddr_t argsp, + /* xdr routine for results */ + xdrproc_t xresults, + /* pointer to results */ + caddr_t resultsp, + /* seconds to wait before giving up */ + struct timeval utimeout) { struct cu_data *cu = (struct cu_data *) cl->cl_private; XDR *xdrs; diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c index c8a8011ea5..e54fe14470 100644 --- a/sunrpc/pmap_rmt.c +++ b/sunrpc/pmap_rmt.c @@ -196,15 +196,22 @@ getbroadcastnets (struct in_addr *addrs, int naddrs) 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 */ - 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 */ +clnt_broadcast (/* program number */ + u_long prog, + /* version number */ + u_long vers, + /* procedure number */ + u_long proc, + /* xdr routine for args */ + xdrproc_t xargs, + /* pointer to args */ + caddr_t argsp, + /* xdr routine for results */ + xdrproc_t xresults, + /* pointer to results */ + caddr_t resultsp, + /* call with each result obtained */ + resultproc_t eachresult) { enum clnt_stat stat = RPC_FAILED; AUTH *unix_auth = authunix_create_default (); diff --git a/sunrpc/rpcsvc/rusers.x b/sunrpc/rpcsvc/rusers.x index 476ed7400c..5bbfe97e79 100644 --- a/sunrpc/rpcsvc/rusers.x +++ b/sunrpc/rpcsvc/rusers.x @@ -137,9 +137,7 @@ program RUSERSPROG { %bool_t xdr_utmp (XDR *xdrs, struct ru_utmp *objp); % %bool_t -%xdr_utmp(xdrs, objp) -% XDR *xdrs; -% struct ru_utmp *objp; +%xdr_utmp (XDR *xdrs, struct ru_utmp *objp) %{ % /* Since the fields are char foo [xxx], we should not free them. */ % if (xdrs->x_op != XDR_FREE) @@ -171,9 +169,7 @@ program RUSERSPROG { %bool_t xdr_utmpptr(XDR *xdrs, struct ru_utmp **objpp); % %bool_t -%xdr_utmpptr(xdrs, objpp) -% XDR *xdrs; -% struct ru_utmp **objpp; +%xdr_utmpptr (XDR *xdrs, struct ru_utmp **objpp) %{ % if (!xdr_reference(xdrs, (char **) objpp, sizeof (struct ru_utmp), % (xdrproc_t) xdr_utmp)) { @@ -183,9 +179,7 @@ program RUSERSPROG { %} % %bool_t -%xdr_utmparr(xdrs, objp) -% XDR *xdrs; -% struct utmparr *objp; +%xdr_utmparr (XDR *xdrs, struct utmparr *objp) %{ % if (!xdr_array(xdrs, (char **)&objp->uta_arr, (u_int *)&objp->uta_cnt, % MAXUSERS, sizeof(struct ru_utmp *), @@ -198,9 +192,7 @@ program RUSERSPROG { %bool_t xdr_utmpidle(XDR *xdrs, struct utmpidle *objp); % %bool_t -%xdr_utmpidle(xdrs, objp) -% XDR *xdrs; -% struct utmpidle *objp; +%xdr_utmpidle (XDR *xdrs, struct utmpidle *objp) %{ % if (!xdr_utmp(xdrs, &objp->ui_utmp)) { % return (FALSE); @@ -214,9 +206,7 @@ program RUSERSPROG { %bool_t xdr_utmpidleptr(XDR *xdrs, struct utmpidle **objp); % %bool_t -%xdr_utmpidleptr(xdrs, objpp) -% XDR *xdrs; -% struct utmpidle **objpp; +%xdr_utmpidleptr (XDR *xdrs, struct utmpidle **objpp) %{ % if (!xdr_reference(xdrs, (char **) objpp, sizeof (struct utmpidle), % (xdrproc_t) xdr_utmpidle)) { @@ -226,9 +216,7 @@ program RUSERSPROG { %} % %bool_t -%xdr_utmpidlearr(xdrs, objp) -% XDR *xdrs; -% struct utmpidlearr *objp; +%xdr_utmpidlearr (XDR *xdrs, struct utmpidlearr *objp) %{ % if (!xdr_array(xdrs, (char **)&objp->uia_arr, (u_int *)&objp->uia_cnt, % MAXUSERS, sizeof(struct utmpidle *), |