[committed 0/2] Trivial malloc cleanups

[committed 0/2] Trivial malloc cleanups

[Siddhesh Poyarekar]

A couple of minor cleanups that have no effect on the generated
binaries.

Siddhesh Poyarekar (2):
  Move mcheck symbol from stdlib to malloc
  _int_realloc is static

 malloc/Versions | 2 +-
 malloc/malloc.c | 4 ++--
 stdlib/Versions | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.31.1

[committed 1/2] Move mcheck symbol from stdlib to malloc

[Siddhesh Poyarekar]

It is defined in malloc, so it belongs there.  Verified on x86_64 that
the built libraries are identical despite this change.
---
 malloc/Versions | 2 +-
 stdlib/Versions | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/malloc/Versions b/malloc/Versions
index 62e4698a08..470a940666 100644
--- a/malloc/Versions
+++ b/malloc/Versions
@@ -26,7 +26,7 @@ libc {
 
     # m*
     mallinfo; malloc; malloc_get_state; malloc_set_state; malloc_stats;
-    malloc_trim; malloc_usable_size; mallopt; memalign; mprobe; mtrace;
+    malloc_trim; malloc_usable_size; mallopt; mcheck; memalign; mprobe; mtrace;
     muntrace;
 
     # o*
diff --git a/stdlib/Versions b/stdlib/Versions
index 9e665d4c26..5e9099a153 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -40,7 +40,7 @@ libc {
 
     # m*
     mblen; mbrlen; mbrtowc; mbsinit; mbsnrtowcs; mbsrtowcs; mbstowcs;
-    mbtowc; mcheck; mcount; mrand48; mrand48_r;
+    mbtowc; mcount; mrand48; mrand48_r;
 
     # n*
     nrand48; nrand48_r;
-- 
2.31.1

[committed 2/2] _int_realloc is static

[Siddhesh Poyarekar]

_int_realloc is correctly declared at the top to be static, but
incorrectly defined without the static keyword.  Fix that.  The
generated binaries have identical code.
---
 malloc/malloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/malloc/malloc.c b/malloc/malloc.c
index a3525f71da..0253453f27 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4822,8 +4822,8 @@ static void malloc_consolidate(mstate av)
   ------------------------------ realloc ------------------------------
 */
 
-void*
-_int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
+static void *
+_int_realloc (mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
 	     INTERNAL_SIZE_T nb)
 {
   mchunkptr        newp;            /* chunk to return */
-- 
2.31.1