m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-09-30 02:19:31 +02:00
Code Issues Releases Activity

Add arguments to malloc and calloc prototypes in Ltest-nocalloc

Browse source
This commit is contained in:
Tommi Rantala 2012-09-21 09:29:16 +03:00
parent 249ff2f840
commit 65f936402d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/Ltest-nocalloc.c
View file

@ -40,17 +40,17 @@ int in_unwind;
void * void *
calloc(size_t n, size_t s) calloc(size_t n, size_t s)
{ {
static void * (*func)(); static void * (*func)(size_t, size_t);
#ifdef __GLIBC__ #ifdef __GLIBC__
/* In glibc, dlsym() calls calloc. Calling dlsym(RTLD_NEXT, "calloc") here /* In glibc, dlsym() calls calloc. Calling dlsym(RTLD_NEXT, "calloc") here
causes infinite recursion. Instead, we simply use it by its other causes infinite recursion. Instead, we simply use it by its other
name. */ name. */
extern void *__libc_calloc(); extern void *__libc_calloc(size_t, size_t);
func = &__libc_calloc; func = &__libc_calloc;
#else #else
if(!func) if(!func)
func = (void *(*)()) dlsym(RTLD_NEXT, "calloc"); func = dlsym(RTLD_NEXT, "calloc");
#endif #endif
if (in_unwind) { if (in_unwind) {
@ -64,10 +64,10 @@ calloc(size_t n, size_t s)
void * void *
malloc(size_t s) malloc(size_t s)
{ {
static void * (*func)(); static void * (*func)(size_t);
if(!func) if(!func)
func = (void *(*)()) dlsym(RTLD_NEXT, "malloc"); func = dlsym(RTLD_NEXT, "malloc");
if (in_unwind) { if (in_unwind) {
num_mallocs++; num_mallocs++;