diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-12-04 05:25:16 +0300 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-01-17 20:47:08 +0300 |
commit | 0bda30e1ffd23488aa4a9b73f228089463fbee1a (patch) | |
tree | b0efb851be762c4d530cc259070005318702321d /newlib/libc/xdr | |
parent | 6783860a2e4e4183c073f62e4bb938cea0e096c3 (diff) |
ansification: remove _CONST
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diffstat (limited to 'newlib/libc/xdr')
-rw-r--r-- | newlib/libc/xdr/xdr_mem.c | 24 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_private.c | 4 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_rec.c | 14 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_sizeof.c | 4 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_stdio.c | 14 |
5 files changed, 30 insertions, 30 deletions
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c index b49dc3b8f..16d128774 100644 --- a/newlib/libc/xdr/xdr_mem.c +++ b/newlib/libc/xdr/xdr_mem.c @@ -55,22 +55,22 @@ static void _EXFUN (xdrmem_destroy, (XDR *)); static bool_t _EXFUN (xdrmem_getlong_aligned, (XDR *, long *)); -static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, _CONST long *)); +static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, const long *)); static bool_t _EXFUN (xdrmem_getlong_unaligned, (XDR *, long *)); -static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, _CONST long *)); +static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, const long *)); static bool_t _EXFUN (xdrmem_getbytes, (XDR *, char *, u_int)); -static bool_t _EXFUN (xdrmem_putbytes, (XDR *, _CONST char *, u_int)); +static bool_t _EXFUN (xdrmem_putbytes, (XDR *, const char *, u_int)); /* XXX: w/64-bit pointers, u_int not enough! */ static u_int _EXFUN (xdrmem_getpos, (XDR *)); static bool_t _EXFUN (xdrmem_setpos, (XDR *, u_int)); static int32_t * _EXFUN (xdrmem_inline_aligned, (XDR *, u_int)); static int32_t * _EXFUN (xdrmem_inline_unaligned, (XDR *, u_int)); static bool_t _EXFUN (xdrmem_getint32_aligned, (XDR *, int32_t *)); -static bool_t _EXFUN (xdrmem_putint32_aligned, (XDR *, _CONST int32_t *)); +static bool_t _EXFUN (xdrmem_putint32_aligned, (XDR *, const int32_t *)); static bool_t _EXFUN (xdrmem_getint32_unaligned, (XDR *, int32_t *)); -static bool_t _EXFUN (xdrmem_putint32_unaligned, (XDR *, _CONST int32_t *)); +static bool_t _EXFUN (xdrmem_putint32_unaligned, (XDR *, const int32_t *)); -static _CONST struct xdr_ops xdrmem_ops_aligned = { +static const struct xdr_ops xdrmem_ops_aligned = { xdrmem_getlong_aligned, xdrmem_putlong_aligned, xdrmem_getbytes, @@ -83,7 +83,7 @@ static _CONST struct xdr_ops xdrmem_ops_aligned = { xdrmem_putint32_aligned }; -static _CONST struct xdr_ops xdrmem_ops_unaligned = { +static const struct xdr_ops xdrmem_ops_unaligned = { xdrmem_getlong_unaligned, xdrmem_putlong_unaligned, xdrmem_getbytes, @@ -137,7 +137,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp), static bool_t _DEFUN (xdrmem_putlong_aligned, (xdrs, lp), XDR * xdrs, - _CONST long *lp) + const long *lp) { if (xdrs->x_handy < sizeof (int32_t)) return FALSE; @@ -166,7 +166,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp), static bool_t _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp), XDR * xdrs, - _CONST long *lp) + const long *lp) { u_int32_t l; @@ -196,7 +196,7 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len), static bool_t _DEFUN (xdrmem_putbytes, (xdrs, addr, len), XDR * xdrs, - _CONST char *addr, + const char *addr, u_int len) { if (xdrs->x_handy < len) @@ -275,7 +275,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip), static bool_t _DEFUN (xdrmem_putint32_aligned, (xdrs, ip), XDR *xdrs, - _CONST int32_t *ip) + const int32_t *ip) { if (xdrs->x_handy < sizeof(int32_t)) return FALSE; @@ -304,7 +304,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip), static bool_t _DEFUN (xdrmem_putint32_unaligned, (xdrs, ip), XDR *xdrs, - _CONST int32_t *ip) + 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 ea557fa03..79358a518 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, + const char *format, va_list ap) { if (xdr_vprintf) @@ -49,7 +49,7 @@ _DEFUN (xdr_vwarnx, (format, ap), void _DEFUN (xdr_warnx, (fmt), - _CONST char *fmt _DOTS) + const char *fmt _DOTS) { va_list ap; va_start (ap, fmt); diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c index 0caadd6d5..367c3cb64 100644 --- a/newlib/libc/xdr/xdr_rec.c +++ b/newlib/libc/xdr/xdr_rec.c @@ -73,17 +73,17 @@ enum xprt_stat }; static bool_t _EXFUN (xdrrec_getlong, (XDR *, long *)); -static bool_t _EXFUN (xdrrec_putlong, (XDR *, _CONST long *)); +static bool_t _EXFUN (xdrrec_putlong, (XDR *, const long *)); static bool_t _EXFUN (xdrrec_getbytes, (XDR *, char *, u_int)); -static bool_t _EXFUN (xdrrec_putbytes, (XDR *, _CONST char *, u_int)); +static bool_t _EXFUN (xdrrec_putbytes, (XDR *, const char *, u_int)); static u_int _EXFUN (xdrrec_getpos, (XDR *)); static bool_t _EXFUN (xdrrec_setpos, (XDR *, u_int)); static int32_t * _EXFUN (xdrrec_inline, (XDR *, u_int)); static void _EXFUN (xdrrec_destroy, (XDR *)); static bool_t _EXFUN (xdrrec_getint32, (XDR *, int32_t *)); -static bool_t _EXFUN (xdrrec_putint32, (XDR *, _CONST int32_t *)); +static bool_t _EXFUN (xdrrec_putint32, (XDR *, const int32_t *)); -static _CONST struct xdr_ops xdrrec_ops = { +static const struct xdr_ops xdrrec_ops = { xdrrec_getlong, xdrrec_putlong, xdrrec_getbytes, @@ -290,7 +290,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp), static bool_t _DEFUN (xdrrec_putlong, (xdrs, lp), XDR * xdrs, - _CONST long *lp) + const long *lp) { RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); int32_t *dest_lp = ((int32_t *) (void *) (rstrm->out_finger)); @@ -345,7 +345,7 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len), static bool_t _DEFUN (xdrrec_putbytes, (xdrs, addr, len), XDR * xdrs, - _CONST char *addr, + const char *addr, u_int len) { RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); @@ -522,7 +522,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip), static bool_t _DEFUN (xdrrec_putint32, (xdrs, ip), XDR *xdrs, - _CONST int32_t *ip) + const int32_t *ip) { RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); int32_t *dest_ip = ((int32_t *) (void *) (rstrm->out_finger)); diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c index 34d1e6036..fe7aaa723 100644 --- a/newlib/libc/xdr/xdr_sizeof.c +++ b/newlib/libc/xdr/xdr_sizeof.c @@ -45,7 +45,7 @@ static bool_t _DEFUN (x_putlong, (xdrs, longp), XDR * xdrs, - _CONST long *longp) + const long *longp) { xdrs->x_handy += BYTES_PER_XDR_UNIT; return TRUE; @@ -134,7 +134,7 @@ _DEFUN (x_destroy, (xdrs), static bool_t _DEFUN (x_putint32, (xdrs, int32p), XDR *xdrs, - _CONST int32_t *int32p) + const int32_t *int32p) { xdrs->x_handy += BYTES_PER_XDR_UNIT; return TRUE; diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c index 5bb4b13f1..e6513e5d0 100644 --- a/newlib/libc/xdr/xdr_stdio.c +++ b/newlib/libc/xdr/xdr_stdio.c @@ -52,19 +52,19 @@ static void _EXFUN (xdrstdio_destroy, (XDR *)); static bool_t _EXFUN (xdrstdio_getlong, (XDR *, long *)); -static bool_t _EXFUN (xdrstdio_putlong, (XDR *, _CONST long *)); +static bool_t _EXFUN (xdrstdio_putlong, (XDR *, const long *)); static bool_t _EXFUN (xdrstdio_getbytes, (XDR *, char *, u_int)); -static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, _CONST char *, u_int)); +static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, const char *, u_int)); static u_int _EXFUN (xdrstdio_getpos, (XDR *)); static bool_t _EXFUN (xdrstdio_setpos, (XDR *, u_int)); static int32_t * _EXFUN (xdrstdio_inline, (XDR *, u_int)); static bool_t _EXFUN (xdrstdio_getint32, (XDR*, int32_t *)); -static bool_t _EXFUN (xdrstdio_putint32, (XDR*, _CONST int32_t *)); +static bool_t _EXFUN (xdrstdio_putint32, (XDR*, const int32_t *)); /* * Ops vector for stdio type XDR */ -static _CONST struct xdr_ops xdrstdio_ops = { +static const struct xdr_ops xdrstdio_ops = { xdrstdio_getlong, /* deseraialize a long int */ xdrstdio_putlong, /* seraialize a long int */ xdrstdio_getbytes, /* deserialize counted bytes */ @@ -123,7 +123,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp), static bool_t _DEFUN (xdrstdio_putlong, (xdrs, lp), XDR * xdrs, - _CONST long *lp) + const long *lp) { u_int32_t temp = htonl ((u_int32_t) * lp); @@ -147,7 +147,7 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len), static bool_t _DEFUN (xdrstdio_putbytes, (xdrs, addr, len), XDR * xdrs, - _CONST char *addr, + const char *addr, u_int len) { if ((len != 0) && (fwrite (addr, (size_t) len, 1, @@ -206,7 +206,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip), static bool_t _DEFUN (xdrstdio_putint32, (xdrs, ip), XDR *xdrs, - _CONST int32_t *ip) + const int32_t *ip) { int32_t temp = htonl (*ip); |