aboutsummaryrefslogtreecommitdiff
path: root/sunrpc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-21 11:57:23 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-10-21 11:57:23 +0000
commit85231522bb178ebe0957529de20b7f3dda81168c (patch)
treebc8f29152d304af5604b0b76344d52a73a94804f /sunrpc
parentca88f362a7e5f14db8e6de71f1ce500b2285307c (diff)
downloadglibc-85231522bb178ebe0957529de20b7f3dda81168c.tar
glibc-85231522bb178ebe0957529de20b7f3dda81168c.tar.gz
glibc-85231522bb178ebe0957529de20b7f3dda81168c.tar.bz2
glibc-85231522bb178ebe0957529de20b7f3dda81168c.zip
Convert a few more function definitions to prototype style.
This patch converts a few more function definitions in glibc from old-style K&R to prototype style. This is sufficient to build and test on x86_64 and x86 with -Wold-style-definition (I'll test on some more architectures before proposing the actual addition of -Wold-style-definition). Tested for x86_64 and x86 with -Wold-style-definition in use (testsuite - this patch affects files containing assertions). * 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.
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/clnt_udp.c22
-rw-r--r--sunrpc/pmap_rmt.c25
-rw-r--r--sunrpc/rpcsvc/rusers.x24
3 files changed, 36 insertions, 35 deletions
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 *),