From 1ba4f03035faabd9090f61ec5514e2abced5ca29 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 8 Mar 2013 16:46:07 +0000 Subject: [PATCH] Remove __malloc_size_t. --- ChangeLog | 19 +++++++++++++++++++ malloc/malloc.h | 1 - malloc/mcheck.c | 23 +++++++++++------------ malloc/mtrace.c | 19 +++++++++---------- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6019060..4d9aac9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2013-03-08 Joseph Myers + + * malloc/malloc.h (__malloc_size_t): Remove macro. + * malloc/mcheck.c (old_malloc_hook): Use size_t instead of + __malloc_size_t. + (old_memalign_hook): Likewise. + (old_realloc_hook): Likewise. + (struct hdr): Likewise. + (flood): Likewise. + (mallochook): Likewise. + (memalignhook): Likewise. + (reallochook): Likewise. + * malloc/mtrace.c (tr_old_malloc_hook): Likewise. + (tr_old_realloc_hook): Likewise. + (tr_old_memalign_hook): Likewise. + (tr_mallochook): Likewise. + (tr_reallochook): Likewise. + (tr_memalignhook): Likewise. + 2013-03-08 Adhemerval Zanella * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h (ldbl_pack): Rename to diff --git a/malloc/malloc.h b/malloc/malloc.h index 9fe7ab2..4695b7d 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -25,7 +25,6 @@ # define __malloc_ptr_t void * /* Used by GNU libc internals. */ -#define __malloc_size_t size_t #define __malloc_ptrdiff_t ptrdiff_t #ifdef _LIBC diff --git a/malloc/mcheck.c b/malloc/mcheck.c index b6eb3b3..2e5eadd 100644 --- a/malloc/mcheck.c +++ b/malloc/mcheck.c @@ -29,11 +29,10 @@ /* Old hook values. */ static void (*old_free_hook) (__ptr_t ptr, const __ptr_t); -static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t); -static __ptr_t (*old_memalign_hook) (__malloc_size_t alignment, - __malloc_size_t size, +static __ptr_t (*old_malloc_hook) (size_t size, const __ptr_t); +static __ptr_t (*old_memalign_hook) (size_t alignment, size_t size, const __ptr_t); -static __ptr_t (*old_realloc_hook) (__ptr_t ptr, __malloc_size_t size, +static __ptr_t (*old_realloc_hook) (__ptr_t ptr, size_t size, const __ptr_t); /* Function to call when something awful happens. */ @@ -48,7 +47,7 @@ static void (*abortfunc) (enum mcheck_status); struct hdr { - __malloc_size_t size; /* Exact size requested by user. */ + size_t size; /* Exact size requested by user. */ unsigned long int magic; /* Magic number to check header integrity. */ struct hdr *prev; struct hdr *next; @@ -69,12 +68,12 @@ static int pedantic; # include # define flood memset #else -static void flood (__ptr_t, int, __malloc_size_t); +static void flood (__ptr_t, int, size_t); static void flood (ptr, val, size) __ptr_t ptr; int val; - __malloc_size_t size; + size_t size; { char *cp = ptr; while (size--) @@ -202,7 +201,7 @@ freehook (__ptr_t ptr, const __ptr_t caller) } static __ptr_t -mallochook (__malloc_size_t size, const __ptr_t caller) +mallochook (size_t size, const __ptr_t caller) { struct hdr *hdr; @@ -235,11 +234,11 @@ mallochook (__malloc_size_t size, const __ptr_t caller) } static __ptr_t -memalignhook (__malloc_size_t alignment, __malloc_size_t size, +memalignhook (size_t alignment, size_t size, const __ptr_t caller) { struct hdr *hdr; - __malloc_size_t slop; + size_t slop; char *block; if (pedantic) @@ -274,7 +273,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size, } static __ptr_t -reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller) +reallochook (__ptr_t ptr, size_t size, const __ptr_t caller) { if (size == 0) { @@ -283,7 +282,7 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller) } struct hdr *hdr; - __malloc_size_t osize; + size_t osize; if (pedantic) mcheck_check_all (); diff --git a/malloc/mtrace.c b/malloc/mtrace.c index e9ccfa2..62867b1 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -58,11 +58,10 @@ __ptr_t mallwatch; /* Old hook values. */ static void (*tr_old_free_hook) (__ptr_t ptr, const __ptr_t); -static __ptr_t (*tr_old_malloc_hook) (__malloc_size_t size, const __ptr_t); -static __ptr_t (*tr_old_realloc_hook) (__ptr_t ptr, __malloc_size_t size, +static __ptr_t (*tr_old_malloc_hook) (size_t size, const __ptr_t); +static __ptr_t (*tr_old_realloc_hook) (__ptr_t ptr, size_t size, const __ptr_t); -static __ptr_t (*tr_old_memalign_hook) (__malloc_size_t __alignment, - __malloc_size_t __size, +static __ptr_t (*tr_old_memalign_hook) (size_t __alignment, size_t __size, const __ptr_t); /* This function is called when the block being alloc'd, realloc'd, or @@ -160,10 +159,10 @@ tr_freehook (ptr, caller) __libc_lock_unlock (lock); } -static __ptr_t tr_mallochook (__malloc_size_t, const __ptr_t) __THROW; +static __ptr_t tr_mallochook (size_t, const __ptr_t) __THROW; static __ptr_t tr_mallochook (size, caller) - __malloc_size_t size; + size_t size; const __ptr_t caller; { __ptr_t hdr; @@ -190,12 +189,12 @@ tr_mallochook (size, caller) return hdr; } -static __ptr_t tr_reallochook (__ptr_t, __malloc_size_t, const __ptr_t) +static __ptr_t tr_reallochook (__ptr_t, size_t, const __ptr_t) __THROW; static __ptr_t tr_reallochook (ptr, size, caller) __ptr_t ptr; - __malloc_size_t size; + size_t size; const __ptr_t caller; { __ptr_t hdr; @@ -243,11 +242,11 @@ tr_reallochook (ptr, size, caller) return hdr; } -static __ptr_t tr_memalignhook (__malloc_size_t, __malloc_size_t, +static __ptr_t tr_memalignhook (size_t, size_t, const __ptr_t) __THROW; static __ptr_t tr_memalignhook (alignment, size, caller) - __malloc_size_t alignment, size; + size_t alignment, size; const __ptr_t caller; { __ptr_t hdr; -- 2.7.4