diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-12-04 08:54:48 +0300 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-01-17 20:47:29 +0300 |
commit | 70ee6b17df9b055a05cdcc4d3fe1813d7b57e2d8 (patch) | |
tree | dca0744ad66ae0e81c8535303f58fca114b80f63 /newlib/libc/xdr | |
parent | 77f16db546d9c214f639d1ea84c58d99f9e4d282 (diff) |
ansification: remove _EXFUN, _EXFUN_NOTHROW
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diffstat (limited to 'newlib/libc/xdr')
-rw-r--r-- | newlib/libc/xdr/xdr_mem.c | 30 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_private.h | 10 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_rec.c | 24 | ||||
-rw-r--r-- | newlib/libc/xdr/xdr_stdio.c | 20 |
4 files changed, 42 insertions, 42 deletions
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c index 3187ade74..a3d97b633 100644 --- a/newlib/libc/xdr/xdr_mem.c +++ b/newlib/libc/xdr/xdr_mem.c @@ -53,22 +53,22 @@ # define htonl(x) xdr_htonl(x) #endif -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_getlong_unaligned, (XDR *, 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 void xdrmem_destroy (XDR *); +static bool_t xdrmem_getlong_aligned (XDR *, long *); +static bool_t xdrmem_putlong_aligned (XDR *, const long *); +static bool_t xdrmem_getlong_unaligned (XDR *, long *); +static bool_t xdrmem_putlong_unaligned (XDR *, const long *); +static bool_t xdrmem_getbytes (XDR *, char *, u_int); +static bool_t 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_getint32_unaligned, (XDR *, int32_t *)); -static bool_t _EXFUN (xdrmem_putint32_unaligned, (XDR *, const int32_t *)); +static u_int xdrmem_getpos (XDR *); +static bool_t xdrmem_setpos (XDR *, u_int); +static int32_t * xdrmem_inline_aligned (XDR *, u_int); +static int32_t * xdrmem_inline_unaligned (XDR *, u_int); +static bool_t xdrmem_getint32_aligned (XDR *, int32_t *); +static bool_t xdrmem_putint32_aligned (XDR *, const int32_t *); +static bool_t xdrmem_getint32_unaligned (XDR *, int32_t *); +static bool_t xdrmem_putint32_unaligned (XDR *, const int32_t *); static const struct xdr_ops xdrmem_ops_aligned = { xdrmem_getlong_aligned, diff --git a/newlib/libc/xdr/xdr_private.h b/newlib/libc/xdr/xdr_private.h index 3b071d668..98c9daada 100644 --- a/newlib/libc/xdr/xdr_private.h +++ b/newlib/libc/xdr/xdr_private.h @@ -43,13 +43,13 @@ extern "C" { typedef void (*xdr_vprintf_t) (const char *, va_list); -xdr_vprintf_t _EXFUN (xdr_set_vprintf, (xdr_vprintf_t)); +xdr_vprintf_t xdr_set_vprintf (xdr_vprintf_t); -void _EXFUN (xdr_vwarnx, (const char *, __VALIST) - _ATTRIBUTE ((__format__ (__printf__, 1, 0)))); +void xdr_vwarnx (const char *, __VALIST) + _ATTRIBUTE ((__format__ (__printf__, 1, 0))); -void _EXFUN (xdr_warnx, (const char *, ...) - _ATTRIBUTE ((__format__ (__printf__, 1, 2)))); +void xdr_warnx (const char *, ...) + _ATTRIBUTE ((__format__ (__printf__, 1, 2))); /* endian issues */ #include <machine/endian.h> diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c index 9051d522f..24cb5eb53 100644 --- a/newlib/libc/xdr/xdr_rec.c +++ b/newlib/libc/xdr/xdr_rec.c @@ -72,16 +72,16 @@ enum xprt_stat XPRT_IDLE }; -static bool_t _EXFUN (xdrrec_getlong, (XDR *, 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 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 xdrrec_getlong (XDR *, long *); +static bool_t xdrrec_putlong (XDR *, const long *); +static bool_t xdrrec_getbytes (XDR *, char *, u_int); +static bool_t xdrrec_putbytes (XDR *, const char *, u_int); +static u_int xdrrec_getpos (XDR *); +static bool_t xdrrec_setpos (XDR *, u_int); +static int32_t * xdrrec_inline (XDR *, u_int); +static void xdrrec_destroy (XDR *); +static bool_t xdrrec_getint32 (XDR *, int32_t *); +static bool_t xdrrec_putint32 (XDR *, const int32_t *); static const struct xdr_ops xdrrec_ops = { xdrrec_getlong, @@ -156,8 +156,8 @@ static bool_t set_input_fragment (RECSTREAM *); static bool_t skip_input_bytes (RECSTREAM *, long); static bool_t realloc_stream (RECSTREAM *, int); -bool_t _EXFUN (__xdrrec_getrec, (XDR *, enum xprt_stat *, bool_t)); -bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int)); +bool_t __xdrrec_getrec (XDR *, enum xprt_stat *, bool_t); +bool_t __xdrrec_setnonblock (XDR *, int); /* * Create an xdr handle for xdrrec diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c index 784ac6c8b..05fbe1f30 100644 --- a/newlib/libc/xdr/xdr_stdio.c +++ b/newlib/libc/xdr/xdr_stdio.c @@ -50,16 +50,16 @@ # define htonl(x) xdr_htonl(x) #endif -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_getbytes, (XDR *, 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 void xdrstdio_destroy (XDR *); +static bool_t xdrstdio_getlong (XDR *, long *); +static bool_t xdrstdio_putlong (XDR *, const long *); +static bool_t xdrstdio_getbytes (XDR *, char *, u_int); +static bool_t xdrstdio_putbytes (XDR *, const char *, u_int); +static u_int xdrstdio_getpos (XDR *); +static bool_t xdrstdio_setpos (XDR *, u_int); +static int32_t * xdrstdio_inline (XDR *, u_int); +static bool_t xdrstdio_getint32 (XDR*, int32_t *); +static bool_t xdrstdio_putint32 (XDR*, const int32_t *); /* * Ops vector for stdio type XDR |