[glibc] malloc: Small fix for code readability

Yury Khrustalev via Glibc-cvs <[email protected]> Wed, 20 May 2026 09:40:51 +0000 (GMT)
Newsgroups gmane.comp.lib.glibc.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1233e256f231ed3b2c421fa87b8f8b4ab3f77075

commit 1233e256f231ed3b2c421fa87b8f8b4ab3f77075
Author: Yury Khrustalev <[email protected]>
Date:   Tue May 19 14:37:13 2026 +0100

    malloc: Small fix for code readability
    
    A couple of small fixes for code readability, no functional change.
    
     - Add missing comments for #endif statements.
     - Move inclusion of string.h from malloc.c to calloc-clear-memory.h
       where it is actually used.
     - Re-order alias definitions for malloc functions.
    
    Reviewed-by: Adhemerval Zanella <[email protected]>

Diff:
---
 malloc/malloc.c                       | 27 +++++++++++++--------------
 sysdeps/generic/calloc-clear-memory.h |  2 ++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 63198fcde1..5313ee68e3 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -441,7 +441,6 @@ tag_at (void *ptr)
   return ptr;
 }
 
-#include <string.h>
 
 /*
   MORECORE-related declarations. By default, rely on sbrk
@@ -2206,7 +2205,7 @@ do_check_malloc_state (mstate av)
   /* top chunk is OK */
   check_chunk (av, av->top);
 }
-#endif
+#endif /* MALLOC_DEBUG */
 
 
 /* ----------------- Support for debugging hooks -------------------- */
@@ -4744,7 +4743,7 @@ __malloc_usable_size (void *m)
     return 0;
   return musable (m);
 }
-#endif
+#endif /* IS_IN (libc) */
 
 /*
    ------------------------------ mallinfo ------------------------------
@@ -5251,7 +5250,7 @@ malloc_printerr_tail (const char *str)
     return;
   malloc_printerr (str);
 }
-#endif
+#endif /* USE_TCACHE */
 
 #if IS_IN (libc)
 /* We need a wrapper function for one of the additions of POSIX.  */
@@ -5271,8 +5270,7 @@ __posix_memalign (void **memptr, size_t alignment, size_t size)
   *memptr = mem;
   return 0;
 }
-weak_alias (__posix_memalign, posix_memalign)
-#endif
+#endif /* IS_IN (libc) */
 
 
 int
@@ -5432,24 +5430,25 @@ __malloc_info (int options, FILE *fp)
 
   return 0;
 }
-#if IS_IN (libc)
-weak_alias (__malloc_info, malloc_info)
 
-weak_alias (__libc_calloc, calloc)
-strong_alias (__libc_free, free)
+#if IS_IN (libc)
 strong_alias (__libc_malloc, malloc)
-weak_alias (__libc_memalign, memalign)
 strong_alias (__libc_realloc, realloc)
+strong_alias (__libc_free, free)
+weak_alias (__libc_calloc, calloc)
+weak_alias (__libc_memalign, memalign)
+weak_alias (__posix_memalign, posix_memalign)
 weak_alias (__libc_valloc, valloc)
 weak_alias (__libc_pvalloc, pvalloc)
+weak_alias (__malloc_usable_size, malloc_usable_size)
+
+weak_alias (__malloc_info, malloc_info)
 weak_alias (__libc_mallinfo, mallinfo)
 weak_alias (__libc_mallinfo2, mallinfo2)
 weak_alias (__libc_mallopt, mallopt)
-
 weak_alias (__malloc_stats, malloc_stats)
-weak_alias (__malloc_usable_size, malloc_usable_size)
 weak_alias (__malloc_trim, malloc_trim)
-#endif
+#endif /* IS_IN (libc) */
 
 #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_26)
 compat_symbol (libc, __libc_free, cfree, GLIBC_2_0);
diff --git a/sysdeps/generic/calloc-clear-memory.h b/sysdeps/generic/calloc-clear-memory.h
index bbcf8657ac..bce9979e66 100644
--- a/sysdeps/generic/calloc-clear-memory.h
+++ b/sysdeps/generic/calloc-clear-memory.h
@@ -16,6 +16,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <string.h>
+
 static __always_inline void *
 clear_memory (INTERNAL_SIZE_T *d, unsigned long clearsize)
 {