aboutsummaryrefslogtreecommitdiff
path: root/newlib/libc/xdr
diff options
context:
space:
mode:
Diffstat (limited to 'newlib/libc/xdr')
-rw-r--r--newlib/libc/xdr/xdr.c80
-rw-r--r--newlib/libc/xdr/xdr_array.c18
-rw-r--r--newlib/libc/xdr/xdr_float.c4
-rw-r--r--newlib/libc/xdr/xdr_float_vax.c4
-rw-r--r--newlib/libc/xdr/xdr_mem.c36
-rw-r--r--newlib/libc/xdr/xdr_private.c2
-rw-r--r--newlib/libc/xdr/xdr_rec.c48
-rw-r--r--newlib/libc/xdr/xdr_reference.c12
-rw-r--r--newlib/libc/xdr/xdr_sizeof.c14
-rw-r--r--newlib/libc/xdr/xdr_stdio.c24
10 files changed, 121 insertions, 121 deletions
diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index 646f9db..8c637fc 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -63,7 +63,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
*/
void
_DEFUN (xdr_free, (proc, objp),
- xdrproc_t proc _AND
+ xdrproc_t proc,
void * objp)
{
XDR x;
@@ -87,7 +87,7 @@ _DEFUN_VOID (xdr_void)
*/
bool_t
_DEFUN (xdr_int, (xdrs, ip),
- XDR * xdrs _AND
+ XDR * xdrs,
int * ip)
{
#if INT_MAX < LONG_MAX
@@ -122,7 +122,7 @@ _DEFUN (xdr_int, (xdrs, ip),
*/
bool_t
_DEFUN (xdr_u_int, (xdrs, up),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int * up)
{
#if UINT_MAX < ULONG_MAX
@@ -157,7 +157,7 @@ _DEFUN (xdr_u_int, (xdrs, up),
*/
bool_t
_DEFUN (xdr_long, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long * lp)
{
if ((xdrs->x_op == XDR_ENCODE)
@@ -178,7 +178,7 @@ _DEFUN (xdr_long, (xdrs, lp),
*/
bool_t
_DEFUN (xdr_u_long, (xdrs, ulp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_long * ulp)
{
switch (xdrs->x_op)
@@ -209,7 +209,7 @@ _DEFUN (xdr_u_long, (xdrs, ulp),
*/
bool_t
_DEFUN (xdr_int32_t, (xdrs, int32_p),
- XDR * xdrs _AND
+ XDR * xdrs,
int32_t * int32_p)
{
switch (xdrs->x_op)
@@ -231,7 +231,7 @@ _DEFUN (xdr_int32_t, (xdrs, int32_p),
*/
bool_t
_DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int32_t * u_int32_p)
{
switch (xdrs->x_op)
@@ -253,7 +253,7 @@ _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
*/
bool_t
_DEFUN (xdr_uint32_t, (xdrs, uint32_p),
- XDR * xdrs _AND
+ XDR * xdrs,
uint32_t * uint32_p)
{
switch (xdrs->x_op)
@@ -275,7 +275,7 @@ _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
*/
bool_t
_DEFUN (xdr_short, (xdrs, sp),
- XDR * xdrs _AND
+ XDR * xdrs,
short * sp)
{
long l;
@@ -303,7 +303,7 @@ _DEFUN (xdr_short, (xdrs, sp),
*/
bool_t
_DEFUN (xdr_u_short, (xdrs, usp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_short * usp)
{
long l;
@@ -332,7 +332,7 @@ _DEFUN (xdr_u_short, (xdrs, usp),
*/
bool_t
_DEFUN (xdr_int16_t, (xdrs, int16_p),
- XDR * xdrs _AND
+ XDR * xdrs,
int16_t * int16_p)
{
int32_t t;
@@ -360,7 +360,7 @@ _DEFUN (xdr_int16_t, (xdrs, int16_p),
*/
bool_t
_DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int16_t * u_int16_p)
{
uint32_t ut;
@@ -388,7 +388,7 @@ _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
*/
bool_t
_DEFUN (xdr_uint16_t, (xdrs, uint16_p),
- XDR * xdrs _AND
+ XDR * xdrs,
uint16_t * uint16_p)
{
uint32_t ut;
@@ -416,7 +416,7 @@ _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
*/
bool_t
_DEFUN (xdr_int8_t, (xdrs, int8_p),
- XDR * xdrs _AND
+ XDR * xdrs,
int8_t * int8_p)
{
int32_t t;
@@ -444,7 +444,7 @@ _DEFUN (xdr_int8_t, (xdrs, int8_p),
*/
bool_t
_DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int8_t * u_int8_p)
{
uint32_t ut;
@@ -472,7 +472,7 @@ _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
*/
bool_t
_DEFUN (xdr_uint8_t, (xdrs, uint8_p),
- XDR * xdrs _AND
+ XDR * xdrs,
uint8_t * uint8_p)
{
uint32_t ut;
@@ -502,7 +502,7 @@ _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
*/
bool_t
_DEFUN (xdr_char, (xdrs, cp),
- XDR * xdrs _AND
+ XDR * xdrs,
char * cp)
{
int i;
@@ -519,7 +519,7 @@ _DEFUN (xdr_char, (xdrs, cp),
*/
bool_t
_DEFUN (xdr_u_char, (xdrs, ucp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_char * ucp)
{
u_int u;
@@ -536,7 +536,7 @@ _DEFUN (xdr_u_char, (xdrs, ucp),
*/
bool_t
_DEFUN (xdr_bool, (xdrs, bp),
- XDR * xdrs _AND
+ XDR * xdrs,
bool_t * bp)
{
long lb;
@@ -564,7 +564,7 @@ _DEFUN (xdr_bool, (xdrs, bp),
*/
bool_t
_DEFUN (xdr_enum, (xdrs, ep),
- XDR * xdrs _AND
+ XDR * xdrs,
enum_t * ep)
{
enum sizecheck
@@ -608,8 +608,8 @@ _DEFUN (xdr_enum, (xdrs, ep),
*/
bool_t
_DEFUN (xdr_opaque, (xdrs, cp, cnt),
- XDR * xdrs _AND
- caddr_t cp _AND
+ XDR * xdrs,
+ caddr_t cp,
u_int cnt)
{
u_int rndup;
@@ -657,9 +657,9 @@ _DEFUN (xdr_opaque, (xdrs, cp, cnt),
*/
bool_t
_DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
- XDR * xdrs _AND
- char ** cpp _AND
- u_int * sizep _AND
+ XDR * xdrs,
+ char ** cpp,
+ u_int * sizep,
u_int maxsize)
{
char *sp = *cpp; /* sp is the actual string pointer */
@@ -712,7 +712,7 @@ _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
*/
bool_t
_DEFUN (xdr_netobj, (xdrs, np),
- XDR * xdrs _AND
+ XDR * xdrs,
struct netobj * np)
{
return (xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -735,10 +735,10 @@ _DEFUN (xdr_netobj, (xdrs, np),
*/
bool_t
_DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
- XDR * xdrs _AND
- enum_t * dscmp _AND
- char * unp _AND
- const struct xdr_discrim * choices _AND
+ XDR * xdrs,
+ enum_t * dscmp,
+ char * unp,
+ const struct xdr_discrim * choices,
xdrproc_t dfault)
{
enum_t dscm;
@@ -784,8 +784,8 @@ _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
*/
bool_t
_DEFUN (xdr_string, (xdrs, cpp, maxsize),
- XDR * xdrs _AND
- char ** cpp _AND
+ XDR * xdrs,
+ char ** cpp,
u_int maxsize)
{
char *sp = *cpp; /* sp is the actual string pointer */
@@ -862,7 +862,7 @@ _DEFUN (xdr_string, (xdrs, cpp, maxsize),
*/
bool_t
_DEFUN (xdr_wrapstring, (xdrs, cpp),
- XDR * xdrs _AND
+ XDR * xdrs,
char ** cpp)
{
return xdr_string (xdrs, cpp, LASTUNSIGNED);
@@ -883,7 +883,7 @@ _DEFUN (xdr_wrapstring, (xdrs, cpp),
*/
bool_t
_DEFUN (xdr_int64_t, (xdrs, llp),
- XDR * xdrs _AND
+ XDR * xdrs,
int64_t * llp)
{
int32_t t1, t2;
@@ -914,7 +914,7 @@ _DEFUN (xdr_int64_t, (xdrs, llp),
*/
bool_t
_DEFUN (xdr_u_int64_t, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int64_t * ullp)
{
uint32_t t1, t2;
@@ -946,7 +946,7 @@ _DEFUN (xdr_u_int64_t, (xdrs, ullp),
*/
bool_t
_DEFUN (xdr_uint64_t, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
uint64_t * ullp)
{
uint32_t t1, t2;
@@ -979,7 +979,7 @@ _DEFUN (xdr_uint64_t, (xdrs, ullp),
*/
bool_t
_DEFUN (xdr_hyper, (xdrs, llp),
- XDR * xdrs _AND
+ XDR * xdrs,
quad_t * llp)
{
/*
@@ -995,7 +995,7 @@ _DEFUN (xdr_hyper, (xdrs, llp),
*/
bool_t
_DEFUN (xdr_u_hyper, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_quad_t * ullp)
{
/*
@@ -1011,7 +1011,7 @@ _DEFUN (xdr_u_hyper, (xdrs, ullp),
*/
bool_t
_DEFUN (xdr_longlong_t, (xdrs, llp),
- XDR * xdrs _AND
+ XDR * xdrs,
quad_t * llp)
{
/*
@@ -1027,7 +1027,7 @@ _DEFUN (xdr_longlong_t, (xdrs, llp),
*/
bool_t
_DEFUN (xdr_u_longlong_t, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_quad_t *ullp)
{
/*
diff --git a/newlib/libc/xdr/xdr_array.c b/newlib/libc/xdr/xdr_array.c
index 98549ac..9c97487 100644
--- a/newlib/libc/xdr/xdr_array.c
+++ b/newlib/libc/xdr/xdr_array.c
@@ -55,11 +55,11 @@
*/
bool_t
_DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
- XDR * xdrs _AND
- caddr_t * addrp _AND
- u_int * sizep _AND
- u_int maxsize _AND
- u_int elsize _AND
+ XDR * xdrs,
+ caddr_t * addrp,
+ u_int * sizep,
+ u_int maxsize,
+ u_int elsize,
xdrproc_t elproc)
{
u_int i;
@@ -139,10 +139,10 @@ _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
*/
bool_t
_DEFUN (xdr_vector, (xdrs, basep, nelem, elemsize, xdr_elem),
- XDR * xdrs _AND
- char *basep _AND
- u_int nelem _AND
- u_int elemsize _AND
+ XDR * xdrs,
+ char *basep,
+ u_int nelem,
+ u_int elemsize,
xdrproc_t xdr_elem)
{
u_int i;
diff --git a/newlib/libc/xdr/xdr_float.c b/newlib/libc/xdr/xdr_float.c
index 00726bb..691e929 100644
--- a/newlib/libc/xdr/xdr_float.c
+++ b/newlib/libc/xdr/xdr_float.c
@@ -60,7 +60,7 @@
bool_t
_DEFUN (xdr_float, (xdrs, fp),
- XDR * xdrs _AND
+ XDR * xdrs,
float *fp)
{
switch (xdrs->x_op)
@@ -81,7 +81,7 @@ _DEFUN (xdr_float, (xdrs, fp),
#if !defined(_DOUBLE_IS_32BITS)
bool_t
_DEFUN (xdr_double, (xdrs, dp),
- XDR * xdrs _AND
+ XDR * xdrs,
double *dp)
{
int32_t *i32p;
diff --git a/newlib/libc/xdr/xdr_float_vax.c b/newlib/libc/xdr/xdr_float_vax.c
index 323e43e..ed94348 100644
--- a/newlib/libc/xdr/xdr_float_vax.c
+++ b/newlib/libc/xdr/xdr_float_vax.c
@@ -82,7 +82,7 @@ static struct sgl_limits
bool_t
_DEFUN (xdr_float, (xdrs, fp),
- XDR * xdrs _AND
+ XDR * xdrs,
float *fp)
{
struct ieee_single is;
@@ -185,7 +185,7 @@ static struct dbl_limits
bool_t
_DEFUN (xdr_double, (xdrs, dp),
- XDR * xdrs _AND
+ XDR * xdrs,
double *dp)
{
int32_t *lp;
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 497342d..b49dc3b 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -102,9 +102,9 @@ static _CONST struct xdr_ops xdrmem_ops_unaligned = {
*/
void
_DEFUN (xdrmem_create, (xdrs, addr, size, op),
- XDR * xdrs _AND
- caddr_t addr _AND
- u_int size _AND
+ XDR * xdrs,
+ caddr_t addr,
+ u_int size,
enum xdr_op op)
{
xdrs->x_op = op;
@@ -123,7 +123,7 @@ _DEFUN (xdrmem_destroy, (xdrs),
static bool_t
_DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
@@ -136,7 +136,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
@@ -149,7 +149,7 @@ _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
u_int32_t l;
@@ -165,7 +165,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
u_int32_t l;
@@ -181,8 +181,8 @@ _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_getbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- char *addr _AND
+ XDR * xdrs,
+ char *addr,
u_int len)
{
if (xdrs->x_handy < len)
@@ -195,8 +195,8 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrmem_putbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- _CONST char *addr _AND
+ XDR * xdrs,
+ _CONST char *addr,
u_int len)
{
if (xdrs->x_handy < len)
@@ -217,7 +217,7 @@ _DEFUN (xdrmem_getpos, (xdrs),
static bool_t
_DEFUN (xdrmem_setpos, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
caddr_t newaddr = xdrs->x_base + pos;
@@ -237,7 +237,7 @@ _DEFUN (xdrmem_setpos, (xdrs, pos),
static int32_t *
_DEFUN (xdrmem_inline_aligned, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
int32_t *buf = 0;
@@ -253,7 +253,7 @@ _DEFUN (xdrmem_inline_aligned, (xdrs, len),
static int32_t *
_DEFUN (xdrmem_inline_unaligned, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
return (0);
@@ -261,7 +261,7 @@ _DEFUN (xdrmem_inline_unaligned, (xdrs, len),
static bool_t
_DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
@@ -274,7 +274,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
@@ -287,7 +287,7 @@ _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
u_int32_t l;
@@ -303,7 +303,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
u_int32_t l;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index 16b37a2..ea557fa 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -36,7 +36,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
void
_DEFUN (xdr_vwarnx, (format, ap),
- _CONST char *format _AND
+ _CONST char *format,
va_list ap)
{
if (xdr_vprintf)
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index eef4c48..0caadd6 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -170,11 +170,11 @@ bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
*/
void
_DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
- XDR * xdrs _AND
- u_int sendsize _AND
- u_int recvsize _AND
- void *tcp_handle _AND
- int _EXPARM (readit, (void *, void *, int)) _AND
+ XDR * xdrs,
+ u_int sendsize,
+ u_int recvsize,
+ void *tcp_handle,
+ int _EXPARM (readit, (void *, void *, int)),
int _EXPARM (writeit, (void *, void *, int)))
{
RECSTREAM *rstrm;
@@ -262,7 +262,7 @@ _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
static bool_t
_DEFUN (xdrrec_getlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -289,7 +289,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
static bool_t
_DEFUN (xdrrec_putlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -314,8 +314,8 @@ _DEFUN (xdrrec_putlong, (xdrs, lp),
static bool_t /* must manage buffers, fragments, and records */
_DEFUN (xdrrec_getbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- char *addr _AND
+ XDR * xdrs,
+ char *addr,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -344,8 +344,8 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrrec_putbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- _CONST char *addr _AND
+ XDR * xdrs,
+ _CONST char *addr,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -399,7 +399,7 @@ _DEFUN (xdrrec_getpos, (xdrs),
static bool_t
_DEFUN (xdrrec_setpos, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -440,7 +440,7 @@ _DEFUN (xdrrec_setpos, (xdrs, pos),
static int32_t *
_DEFUN (xdrrec_inline, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -494,7 +494,7 @@ _DEFUN (xdrrec_destroy, (xdrs),
static bool_t
_DEFUN (xdrrec_getint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -521,7 +521,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
static bool_t
_DEFUN (xdrrec_putint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -618,7 +618,7 @@ _DEFUN (xdrrec_eof, (xdrs),
*/
bool_t
_DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
- XDR * xdrs _AND
+ XDR * xdrs,
bool_t sendnow)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -645,8 +645,8 @@ _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
*/
bool_t
_DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
- XDR * xdrs _AND
- enum xprt_stat * statp _AND
+ XDR * xdrs,
+ enum xprt_stat * statp,
bool_t expectdata)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -738,7 +738,7 @@ _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
bool_t
_DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
- XDR * xdrs _AND
+ XDR * xdrs,
int maxrec)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -755,7 +755,7 @@ _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
*/
static bool_t
_DEFUN (flush_out, (rstrm, eor),
- RECSTREAM * rstrm _AND
+ RECSTREAM * rstrm,
bool_t eor)
{
u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
@@ -799,8 +799,8 @@ _DEFUN (fill_input_buf, (rstrm),
static bool_t /* knows nothing about records! Only about input buffers */
_DEFUN (get_input_bytes, (rstrm, addr, len),
- RECSTREAM * rstrm _AND
- char *addr _AND
+ RECSTREAM * rstrm,
+ char *addr,
size_t len)
{
size_t current;
@@ -861,7 +861,7 @@ _DEFUN (set_input_fragment, (rstrm),
static bool_t /* consumes input bytes; knows nothing about records! */
_DEFUN (skip_input_bytes, (rstrm, cnt),
- RECSTREAM * rstrm _AND
+ RECSTREAM * rstrm,
long cnt)
{
size_t current;
@@ -898,7 +898,7 @@ _DEFUN (fix_buf_size, (s),
*/
static bool_t
_DEFUN (realloc_stream, (rstrm, size),
- RECSTREAM * rstrm _AND
+ RECSTREAM * rstrm,
int size)
{
ptrdiff_t diff;
diff --git a/newlib/libc/xdr/xdr_reference.c b/newlib/libc/xdr/xdr_reference.c
index 010a7e7..7a5f1d8 100644
--- a/newlib/libc/xdr/xdr_reference.c
+++ b/newlib/libc/xdr/xdr_reference.c
@@ -57,9 +57,9 @@
*/
bool_t
_DEFUN (xdr_reference, (xdrs, pp, size, proc),
- XDR * xdrs _AND
- caddr_t * pp _AND
- u_int size _AND
+ XDR * xdrs,
+ caddr_t * pp,
+ u_int size,
xdrproc_t proc)
{
caddr_t loc = *pp;
@@ -118,9 +118,9 @@ _DEFUN (xdr_reference, (xdrs, pp, size, proc),
*/
bool_t
_DEFUN (xdr_pointer, (xdrs, objpp, obj_size, xdr_obj),
- XDR * xdrs _AND
- char **objpp _AND
- u_int obj_size _AND
+ XDR * xdrs,
+ char **objpp,
+ u_int obj_size,
xdrproc_t xdr_obj)
{
bool_t more_data;
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 156a2e1..34d1e60 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -44,7 +44,7 @@
/* ARGSUSED */
static bool_t
_DEFUN (x_putlong, (xdrs, longp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *longp)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -54,8 +54,8 @@ _DEFUN (x_putlong, (xdrs, longp),
/* ARGSUSED */
static bool_t
_DEFUN (x_putbytes, (xdrs, bp, len),
- XDR * xdrs _AND
- const char *bp _AND
+ XDR * xdrs,
+ const char *bp,
u_int len)
{
xdrs->x_handy += len;
@@ -72,7 +72,7 @@ _DEFUN (x_getpostn, (xdrs),
/* ARGSUSED */
static bool_t
_DEFUN (x_setpostn, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
/* This is not allowed */
@@ -81,7 +81,7 @@ _DEFUN (x_setpostn, (xdrs, pos),
static int32_t *
_DEFUN (x_inline, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
if (len == 0)
@@ -133,7 +133,7 @@ _DEFUN (x_destroy, (xdrs),
static bool_t
_DEFUN (x_putint32, (xdrs, int32p),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *int32p)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -143,7 +143,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
unsigned long
_DEFUN (xdr_sizeof, (func, data),
- xdrproc_t func _AND
+ xdrproc_t func,
_PTR data)
{
XDR x;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index c933c68..5bb4b13 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -84,8 +84,8 @@ static _CONST struct xdr_ops xdrstdio_ops = {
*/
void
_DEFUN (xdrstdio_create, (xdrs, file, op),
- XDR * xdrs _AND
- FILE * file _AND
+ XDR * xdrs,
+ FILE * file,
enum xdr_op op)
{
xdrs->x_op = op;
@@ -109,7 +109,7 @@ _DEFUN (xdrstdio_destroy, (xdrs),
static bool_t
_DEFUN (xdrstdio_getlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
u_int32_t temp;
@@ -122,7 +122,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
static bool_t
_DEFUN (xdrstdio_putlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -134,8 +134,8 @@ _DEFUN (xdrstdio_putlong, (xdrs, lp),
static bool_t
_DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- char *addr _AND
+ XDR * xdrs,
+ char *addr,
u_int len)
{
if ((len != 0) && (fread (addr, (size_t) len, 1,
@@ -146,8 +146,8 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- _CONST char *addr _AND
+ XDR * xdrs,
+ _CONST char *addr,
u_int len)
{
if ((len != 0) && (fwrite (addr, (size_t) len, 1,
@@ -165,7 +165,7 @@ _DEFUN (xdrstdio_getpos, (xdrs),
static bool_t
_DEFUN (xdrstdio_setpos, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
return ((fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0) ?
@@ -175,7 +175,7 @@ _DEFUN (xdrstdio_setpos, (xdrs, pos),
/* ARGSUSED */
static int32_t *
_DEFUN (xdrstdio_inline, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
/*
@@ -192,7 +192,7 @@ _DEFUN (xdrstdio_inline, (xdrs, len),
static bool_t
_DEFUN (xdrstdio_getint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
int32_t temp;
@@ -205,7 +205,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
static bool_t
_DEFUN (xdrstdio_putint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
int32_t temp = htonl (*ip);
generated by cgit v1.1 at 2025-01-03 22:21:21 +0000