Blame SOURCES/glibc-rh1505492-prototypes-4.patch

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