|
 |
c6d234 |
commit c13a72b7c4864f23b9f2e96a3369e5875ed3b51b
|
|
|
c6d234 |
Author: Will Newton <will.newton@linaro.org>
|
|
|
c6d234 |
Date: Thu Feb 6 08:54:20 2014 +0000
|
|
|
c6d234 |
|
|
|
c6d234 |
malloc/mtrace.c: Cosmetic cleanup.
|
|
|
c6d234 |
|
|
|
c6d234 |
Remove an unused #define and use ANSI prototypes.
|
|
|
c6d234 |
|
|
|
c6d234 |
Generated code identical on x86_64-unknown-linux-gnu.
|
|
|
c6d234 |
|
|
|
c6d234 |
ChangeLog:
|
|
|
c6d234 |
|
|
|
c6d234 |
2014-02-11 Will Newton <will.newton@linaro.org>
|
|
|
c6d234 |
|
|
|
c6d234 |
* malloc/mtrace.c (attribute_hidden): Remove unused macro
|
|
|
c6d234 |
definition. (tr_where, tr_freehook, tr_mallochook,
|
|
|
c6d234 |
tr_reallochook, tr_memalignhook): Use ANSI protoype.
|
|
|
c6d234 |
|
|
|
c6d234 |
Conflicts:
|
|
|
c6d234 |
malloc/mtrace.c
|
|
|
c6d234 |
|
|
|
c6d234 |
Textual conflicts due to missing backport of commit
|
|
|
c6d234 |
6c8dbf00f536d78b1937b5af6f57be47fd376344 (Reformat malloc to gnu
|
|
|
c6d234 |
style.).
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
|
|
|
c6d234 |
index 34ec2a85b219882c..5c4deda5a55a799c 100644
|
|
|
c6d234 |
--- a/malloc/mtrace.c
|
|
|
c6d234 |
+++ b/malloc/mtrace.c
|
|
|
c6d234 |
@@ -41,10 +41,6 @@
|
|
|
c6d234 |
|
|
|
c6d234 |
#include <kernel-features.h>
|
|
|
c6d234 |
|
|
|
c6d234 |
-#ifndef attribute_hidden
|
|
|
c6d234 |
-# define attribute_hidden
|
|
|
c6d234 |
-#endif
|
|
|
c6d234 |
-
|
|
|
c6d234 |
#define TRACE_BUFFER_SIZE 512
|
|
|
c6d234 |
|
|
|
c6d234 |
static FILE *mallstream;
|
|
|
c6d234 |
@@ -77,12 +73,8 @@ tr_break (void)
|
|
|
c6d234 |
}
|
|
|
c6d234 |
libc_hidden_def (tr_break)
|
|
|
c6d234 |
|
|
|
c6d234 |
-static void tr_where (const __ptr_t, Dl_info *) __THROW internal_function;
|
|
|
c6d234 |
-static void
|
|
|
c6d234 |
-internal_function
|
|
|
c6d234 |
-tr_where (caller, info)
|
|
|
c6d234 |
- const __ptr_t caller;
|
|
|
c6d234 |
- Dl_info *info;
|
|
|
c6d234 |
+static void internal_function
|
|
|
c6d234 |
+tr_where (const __ptr_t caller, Dl_info *info)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
if (caller != NULL)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
@@ -115,7 +107,6 @@ tr_where (caller, info)
|
|
|
c6d234 |
}
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
-
|
|
|
c6d234 |
static Dl_info *
|
|
|
c6d234 |
lock_and_info (const __ptr_t caller, Dl_info *mem)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
@@ -129,12 +120,8 @@ lock_and_info (const __ptr_t caller, Dl_info *mem)
|
|
|
c6d234 |
return res;
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
-
|
|
|
c6d234 |
-static void tr_freehook (__ptr_t, const __ptr_t) __THROW;
|
|
|
c6d234 |
static void
|
|
|
c6d234 |
-tr_freehook (ptr, caller)
|
|
|
c6d234 |
- __ptr_t ptr;
|
|
|
c6d234 |
- const __ptr_t caller;
|
|
|
c6d234 |
+tr_freehook (__ptr_t ptr, const __ptr_t caller)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
if (ptr == NULL)
|
|
|
c6d234 |
return;
|
|
|
c6d234 |
@@ -159,11 +146,8 @@ tr_freehook (ptr, caller)
|
|
|
c6d234 |
__libc_lock_unlock (lock);
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
-static __ptr_t tr_mallochook (size_t, const __ptr_t) __THROW;
|
|
|
c6d234 |
static __ptr_t
|
|
|
c6d234 |
-tr_mallochook (size, caller)
|
|
|
c6d234 |
- size_t size;
|
|
|
c6d234 |
- const __ptr_t caller;
|
|
|
c6d234 |
+tr_mallochook (size_t size, const __ptr_t caller)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
__ptr_t hdr;
|
|
|
c6d234 |
|
|
|
c6d234 |
@@ -189,13 +173,8 @@ tr_mallochook (size, caller)
|
|
|
c6d234 |
return hdr;
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
-static __ptr_t tr_reallochook (__ptr_t, size_t, const __ptr_t)
|
|
|
c6d234 |
- __THROW;
|
|
|
c6d234 |
static __ptr_t
|
|
|
c6d234 |
-tr_reallochook (ptr, size, caller)
|
|
|
c6d234 |
- __ptr_t ptr;
|
|
|
c6d234 |
- size_t size;
|
|
|
c6d234 |
- const __ptr_t caller;
|
|
|
c6d234 |
+tr_reallochook (__ptr_t ptr, size_t size, const __ptr_t caller)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
__ptr_t hdr;
|
|
|
c6d234 |
|
|
|
c6d234 |
@@ -237,12 +216,8 @@ tr_reallochook (ptr, size, caller)
|
|
|
c6d234 |
return hdr;
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
-static __ptr_t tr_memalignhook (size_t, size_t,
|
|
|
c6d234 |
- const __ptr_t) __THROW;
|
|
|
c6d234 |
static __ptr_t
|
|
|
c6d234 |
-tr_memalignhook (alignment, size, caller)
|
|
|
c6d234 |
- size_t alignment, size;
|
|
|
c6d234 |
- const __ptr_t caller;
|
|
|
c6d234 |
+tr_memalignhook (size_t alignment, size_t size, const __ptr_t caller)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
__ptr_t hdr;
|
|
|
c6d234 |
|
|
|
c6d234 |
@@ -271,7 +246,6 @@ tr_memalignhook (alignment, size, caller)
|
|
|
c6d234 |
}
|
|
|
c6d234 |
|
|
|
c6d234 |
|
|
|
c6d234 |
-
|
|
|
c6d234 |
#ifdef _LIBC
|
|
|
c6d234 |
|
|
|
c6d234 |
/* This function gets called to make sure all memory the library
|