diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 11:32:18 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 11:32:18 +0000 |
commit | a66bc0f761fcc23e27977921cfe583d1c9ba3e82 (patch) | |
tree | df1394ed9059db704ff552239117a99e1ed1d547 /cpukit/librpc/src/xdr/xdr.c | |
parent | 2008-09-01 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-a66bc0f761fcc23e27977921cfe583d1c9ba3e82.tar.bz2 |
Stop using old-style function definitions.
Diffstat (limited to 'cpukit/librpc/src/xdr/xdr.c')
-rw-r--r-- | cpukit/librpc/src/xdr/xdr.c | 156 |
1 files changed, 77 insertions, 79 deletions
diff --git a/cpukit/librpc/src/xdr/xdr.c b/cpukit/librpc/src/xdr/xdr.c index 898c1f24ff..a27ac17552 100644 --- a/cpukit/librpc/src/xdr/xdr.c +++ b/cpukit/librpc/src/xdr/xdr.c @@ -71,9 +71,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; - char *objp; +xdr_free( + xdrproc_t proc, + char *objp) { XDR x; @@ -85,9 +85,7 @@ xdr_free(proc, objp) * XDR nothing */ bool_t -xdr_void(/* xdrs, addr */) - /* XDR *xdrs; */ - /* caddr_t addr; */ +xdr_void(void) { return (TRUE); @@ -98,9 +96,9 @@ xdr_void(/* xdrs, addr */) * XDR integers */ bool_t -xdr_int(xdrs, ip) - XDR *xdrs; - int *ip; +xdr_int( + XDR *xdrs, + int *ip) { long l; @@ -128,9 +126,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; @@ -160,9 +158,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: @@ -181,9 +179,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: @@ -203,9 +201,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; @@ -234,9 +232,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; @@ -263,9 +261,9 @@ xdr_u_int32_t(xdrs, u_int32_p) * XDR short integers */ bool_t -xdr_short(xdrs, sp) - XDR *xdrs; - short *sp; +xdr_short( + XDR *xdrs, + short *sp) { long l; @@ -293,9 +291,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; @@ -324,9 +322,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; @@ -354,9 +352,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; @@ -385,9 +383,9 @@ xdr_u_int16_t(xdrs, u_int16_p) * XDR a char */ bool_t -xdr_char(xdrs, cp) - XDR *xdrs; - char *cp; +xdr_char( + XDR *xdrs, + char *cp) { int i; @@ -403,9 +401,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; @@ -421,9 +419,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; @@ -451,9 +449,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) { #ifndef lint enum sizecheck { SIZEVAL }; /* used to find the size of an enum */ @@ -483,10 +481,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]; @@ -535,11 +533,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; @@ -591,9 +589,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)); @@ -611,12 +609,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; @@ -660,10 +658,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 = 0; @@ -727,9 +725,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, LASTUNSIGNED); } @@ -738,9 +736,9 @@ xdr_wrapstring(xdrs, cpp) * XDR 64-bit integers */ bool_t -xdr_int64_t(xdrs, int64_p) - XDR *xdrs; - int64_t *int64_p; +xdr_int64_t( + XDR *xdrs, + int64_t *int64_p) { int64_t x; @@ -765,9 +763,9 @@ xdr_int64_t(xdrs, int64_p) * XDR unsigned 64-bit integers */ bool_t -xdr_u_int64_t(xdrs, uint64_p) - XDR *xdrs; - u_int64_t *uint64_p; +xdr_u_int64_t( + XDR *xdrs, + u_int64_t *uint64_p) { u_int64_t x; |