diff options
| author | Will Newton <will.newton@linaro.org> | 2014-02-06 08:54:20 +0000 |
|---|---|---|
| committer | Will Newton <will.newton@linaro.org> | 2014-02-11 10:02:57 +0000 |
| commit | c13a72b7c4864f23b9f2e96a3369e5875ed3b51b (patch) | |
| tree | f708ffeae00e832e60ab9170b6b19043fd7a6180 | |
| parent | 195b8165ac35dfe9f5ba14e1a69bb88b7686c5a9 (diff) | |
| download | glibc-c13a72b7c4864f23b9f2e96a3369e5875ed3b51b.tar glibc-c13a72b7c4864f23b9f2e96a3369e5875ed3b51b.tar.gz glibc-c13a72b7c4864f23b9f2e96a3369e5875ed3b51b.tar.bz2 glibc-c13a72b7c4864f23b9f2e96a3369e5875ed3b51b.zip | |
malloc/mtrace.c: Cosmetic cleanup.
Remove an unused #define and use ANSI prototypes.
Generated code identical on x86_64-unknown-linux-gnu.
ChangeLog:
2014-02-11 Will Newton <will.newton@linaro.org>
* malloc/mtrace.c (attribute_hidden): Remove unused macro
definition. (tr_where, tr_freehook, tr_mallochook,
tr_reallochook, tr_memalignhook): Use ANSI protoype.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/mtrace.c | 41 |
2 files changed, 16 insertions, 31 deletions
@@ -1,3 +1,9 @@ +2014-02-11 Will Newton <will.newton@linaro.org> + + * malloc/mtrace.c (attribute_hidden): Remove unused macro + definition. (tr_where, tr_freehook, tr_mallochook, + tr_reallochook, tr_memalignhook): Use ANSI protoype. + 2014-02-11 David S. Miller <davem@davemloft.net> * stdio-common/tst-sscanf.c (main): Use 'long' for 'dummy' when diff --git a/malloc/mtrace.c b/malloc/mtrace.c index 99ebaffb9b..91e5710468 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -41,10 +41,6 @@ #include <kernel-features.h> -#ifndef attribute_hidden -# define attribute_hidden -#endif - #define TRACE_BUFFER_SIZE 512 static FILE *mallstream; @@ -77,11 +73,8 @@ tr_break (void) } libc_hidden_def (tr_break) -static void tr_where (const __ptr_t, Dl_info *) __THROW internal_function; -static void -internal_function tr_where (caller, info) -const __ptr_t caller; -Dl_info *info; +static void internal_function +tr_where (const __ptr_t caller, Dl_info *info) { if (caller != NULL) { @@ -114,7 +107,6 @@ Dl_info *info; } } - static Dl_info * lock_and_info (const __ptr_t caller, Dl_info *mem) { @@ -128,11 +120,8 @@ lock_and_info (const __ptr_t caller, Dl_info *mem) return res; } - -static void tr_freehook (__ptr_t, const __ptr_t) __THROW; -static void tr_freehook (ptr, caller) -__ptr_t ptr; -const __ptr_t caller; +static void +tr_freehook (__ptr_t ptr, const __ptr_t caller) { if (ptr == NULL) return; @@ -157,10 +146,8 @@ const __ptr_t caller; __libc_lock_unlock (lock); } -static __ptr_t tr_mallochook (size_t, const __ptr_t) __THROW; -static __ptr_t tr_mallochook (size, caller) -size_t size; -const __ptr_t caller; +static __ptr_t +tr_mallochook (size_t size, const __ptr_t caller) { __ptr_t hdr; @@ -186,12 +173,8 @@ const __ptr_t caller; return hdr; } -static __ptr_t tr_reallochook (__ptr_t, size_t, const __ptr_t) -__THROW; -static __ptr_t tr_reallochook (ptr, size, caller) -__ptr_t ptr; -size_t size; -const __ptr_t caller; +static __ptr_t +tr_reallochook (__ptr_t ptr, size_t size, const __ptr_t caller) { __ptr_t hdr; @@ -238,11 +221,8 @@ const __ptr_t caller; return hdr; } -static __ptr_t tr_memalignhook (size_t, size_t, - const __ptr_t) __THROW; -static __ptr_t tr_memalignhook (alignment, size, caller) -size_t alignment, size; -const __ptr_t caller; +static __ptr_t +tr_memalignhook (size_t alignment, size_t size, const __ptr_t caller) { __ptr_t hdr; @@ -271,7 +251,6 @@ const __ptr_t caller; } - #ifdef _LIBC /* This function gets called to make sure all memory the library |