diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-12-04 05:53:22 +0300 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-01-17 20:47:16 +0300 |
commit | e6321aa6a668376c40bc2792a3bd392e94c29ad6 (patch) | |
tree | fe4028a6278a7d3f49ff79f0e5150b49f225685f /newlib/libc/stdlib | |
parent | 0403b9c8c40a351ba72f587add10669df225680b (diff) |
ansification: remove _PTR
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diffstat (limited to 'newlib/libc/stdlib')
-rw-r--r-- | newlib/libc/stdlib/__call_atexit.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdlib/atexit.h | 4 | ||||
-rw-r--r-- | newlib/libc/stdlib/calloc.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdlib/cxa_atexit.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdlib/exit.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdlib/malign.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdlib/malloc.c | 4 | ||||
-rw-r--r-- | newlib/libc/stdlib/msize.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdlib/on_exit.c | 4 | ||||
-rw-r--r-- | newlib/libc/stdlib/realloc.c | 4 | ||||
-rw-r--r-- | newlib/libc/stdlib/reallocf.c | 8 | ||||
-rw-r--r-- | newlib/libc/stdlib/valloc.c | 4 |
12 files changed, 22 insertions, 22 deletions
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c index e6c1ee643..ad70fcd33 100644 --- a/newlib/libc/stdlib/__call_atexit.c +++ b/newlib/libc/stdlib/__call_atexit.c @@ -66,7 +66,7 @@ register_fini(void) void _DEFUN (__call_exitprocs, (code, d), - int code, _PTR d) + int code, void *d) { register struct _atexit *p; struct _atexit **lastp; @@ -119,9 +119,9 @@ _DEFUN (__call_exitprocs, (code, d), if (!args || (args->_fntypes & i) == 0) fn (); else if ((args->_is_cxa & i) == 0) - (*((void (*)(int, _PTR)) fn))(code, args->_fnargs[n]); + (*((void (*)(int, void *)) fn))(code, args->_fnargs[n]); else - (*((void (*)(_PTR)) fn))(args->_fnargs[n]); + (*((void (*)(void *)) fn))(args->_fnargs[n]); /* The function we called call atexit and registered another function (or functions). Call these new functions before diff --git a/newlib/libc/stdlib/atexit.h b/newlib/libc/stdlib/atexit.h index eadc7d13d..df99963d5 100644 --- a/newlib/libc/stdlib/atexit.h +++ b/newlib/libc/stdlib/atexit.h @@ -9,6 +9,6 @@ enum __atexit_types __et_cxa }; -void __call_exitprocs (int, _PTR); -int __register_exitproc (int, void (*fn) (void), _PTR, _PTR); +void __call_exitprocs (int, void *); +int __register_exitproc (int, void (*fn) (void), void *, void *); diff --git a/newlib/libc/stdlib/calloc.c b/newlib/libc/stdlib/calloc.c index dfdb7f5dc..f853f4f3c 100644 --- a/newlib/libc/stdlib/calloc.c +++ b/newlib/libc/stdlib/calloc.c @@ -45,7 +45,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, #ifndef _REENT_ONLY -_PTR +void * _DEFUN (calloc, (n, size), size_t n, size_t size) diff --git a/newlib/libc/stdlib/cxa_atexit.c b/newlib/libc/stdlib/cxa_atexit.c index c03894c4a..096add4fa 100644 --- a/newlib/libc/stdlib/cxa_atexit.c +++ b/newlib/libc/stdlib/cxa_atexit.c @@ -30,7 +30,7 @@ _DEFUN (__cxa_atexit, { #ifdef _LITE_EXIT /* Refer to comments in __atexit.c for more details of lite exit. */ - int __register_exitproc (int, void (*fn) (void), _PTR, _PTR) + int __register_exitproc (int, void (*fn) (void), void *, void *) __attribute__ ((weak)); if (!__register_exitproc) diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c index 481985cd1..8fa949081 100644 --- a/newlib/libc/stdlib/exit.c +++ b/newlib/libc/stdlib/exit.c @@ -55,7 +55,7 @@ _DEFUN (exit, (code), { #ifdef _LITE_EXIT /* Refer to comments in __atexit.c for more details of lite exit. */ - void __call_exitprocs (int, _PTR)) __attribute__((weak); + void __call_exitprocs (int, void *)) __attribute__((weak); if (__call_exitprocs) #endif __call_exitprocs (code, NULL); diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c index d36846f98..e7d56bb51 100644 --- a/newlib/libc/stdlib/malign.c +++ b/newlib/libc/stdlib/malign.c @@ -8,7 +8,7 @@ #ifndef _REENT_ONLY -_PTR +void * _DEFUN (memalign, (align, nbytes), size_t align, size_t nbytes) diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c index 9cf897852..5acaa85d3 100644 --- a/newlib/libc/stdlib/malloc.c +++ b/newlib/libc/stdlib/malloc.c @@ -158,7 +158,7 @@ Supporting OS subroutines required: <<sbrk>>. */ #ifndef _REENT_ONLY -_PTR +void * _DEFUN (malloc, (nbytes), size_t nbytes) /* get a block */ { @@ -167,7 +167,7 @@ _DEFUN (malloc, (nbytes), void _DEFUN (free, (aptr), - _PTR aptr) + void *aptr) { _free_r (_REENT, aptr); } diff --git a/newlib/libc/stdlib/msize.c b/newlib/libc/stdlib/msize.c index e33e4aa37..8c2b221e4 100644 --- a/newlib/libc/stdlib/msize.c +++ b/newlib/libc/stdlib/msize.c @@ -10,7 +10,7 @@ size_t _DEFUN (malloc_usable_size, (ptr), - _PTR ptr) + void *ptr) { return _malloc_usable_size_r (_REENT, ptr); } diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c index b21cf0cb2..329b25425 100644 --- a/newlib/libc/stdlib/on_exit.c +++ b/newlib/libc/stdlib/on_exit.c @@ -68,8 +68,8 @@ const void * const __on_exit_dummy = &__on_exit_args; int _DEFUN (on_exit, (fn, arg), - _VOID _EXFNPTR(fn, (int, _PTR)), - _PTR arg) + _VOID _EXFNPTR(fn, (int, void *)), + void *arg) { return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL); } diff --git a/newlib/libc/stdlib/realloc.c b/newlib/libc/stdlib/realloc.c index 8258e211e..00a88a5a2 100644 --- a/newlib/libc/stdlib/realloc.c +++ b/newlib/libc/stdlib/realloc.c @@ -10,9 +10,9 @@ int _dummy_realloc = 1; #ifndef _REENT_ONLY -_PTR +void * _DEFUN (realloc, (ap, nbytes), - _PTR ap, + void *ap, size_t nbytes) { return _realloc_r (_REENT, ap, nbytes); diff --git a/newlib/libc/stdlib/reallocf.c b/newlib/libc/stdlib/reallocf.c index b3f1b2aab..c4aaeaeaa 100644 --- a/newlib/libc/stdlib/reallocf.c +++ b/newlib/libc/stdlib/reallocf.c @@ -30,10 +30,10 @@ #include <stdlib.h> -_PTR +void * _DEFUN (_reallocf_r, (reentptr, ptr, size), struct _reent *reentptr, - _PTR ptr, + void *ptr, size_t size) { void *nptr; @@ -45,9 +45,9 @@ _DEFUN (_reallocf_r, (reentptr, ptr, size), } #ifndef _REENT_ONLY -_PTR +void * _DEFUN (reallocf, (ptr, size), - _PTR ptr, + void *ptr, size_t size) { return _reallocf_r(_REENT, ptr, size); diff --git a/newlib/libc/stdlib/valloc.c b/newlib/libc/stdlib/valloc.c index 26a44df44..83a839e31 100644 --- a/newlib/libc/stdlib/valloc.c +++ b/newlib/libc/stdlib/valloc.c @@ -8,14 +8,14 @@ #ifndef _REENT_ONLY -_PTR +void * _DEFUN (valloc, (nbytes), size_t nbytes) { return _valloc_r (_REENT, nbytes); } -_PTR +void * _DEFUN (pvalloc, (nbytes), size_t nbytes) { |