Don't declare __malloc_check_init in <malloc.h> (bug 23352)
Commit Message
The function was never part of the malloc API.
[BZ #23352]
* malloc/malloc.h (__malloc_check_init): Don't declare.
* include/malloc.h (__malloc_check_init): Likewise.
* malloc/malloc-internal.h (__malloc_check_init): Declare it here.
* manual/memory.texi (__malloc_check_init): Don't mention it.
---
include/malloc.h | 2 --
malloc/malloc-internal.h | 3 +++
malloc/malloc.h | 3 ---
manual/memory.texi | 1 -
4 files changed, 3 insertions(+), 6 deletions(-)
Comments
* Andreas Schwab:
> The function was never part of the malloc API.
>
> [BZ #23352]
> * malloc/malloc.h (__malloc_check_init): Don't declare.
> * include/malloc.h (__malloc_check_init): Likewise.
> * malloc/malloc-internal.h (__malloc_check_init): Declare it here.
> * manual/memory.texi (__malloc_check_init): Don't mention it.
Looks good to me.
Thanks,
Florian
@@ -9,8 +9,6 @@
/* Nonzero if the malloc is already initialized. */
extern int __malloc_initialized attribute_hidden;
-extern __typeof (__malloc_check_init) __malloc_check_init attribute_hidden;
-
struct malloc_state;
typedef struct malloc_state *mstate;
@@ -74,4 +74,7 @@ void __malloc_fork_unlock_child (void) attribute_hidden;
/* Called as part of the thread shutdown sequence. */
void __malloc_arena_thread_freeres (void) attribute_hidden;
+/* Activate a standard set of debugging hooks. */
+void __malloc_check_init (void) attribute_hidden;
+
#endif /* _MALLOC_INTERNAL_H */
@@ -159,9 +159,6 @@ extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t __alignment,
__MALLOC_DEPRECATED;
extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void);
-/* Activate a standard set of debugging hooks. */
-extern void __malloc_check_init (void) __THROW __MALLOC_DEPRECATED;
-
__END_DECLS
#endif /* malloc.h */
@@ -1056,7 +1056,6 @@ systems that do not support @w{ISO C11}.
@c next_env_entry ok
@c strcspn dup ok
@c __libc_mallopt dup @mtasuconst:mallopt [setting mp_]
-@c __malloc_check_init @mtasuconst:malloc_hooks [setting hooks]
@c *__malloc_initialize_hook unguarded, ok
@c *__memalign_hook dup ok, unguarded
@c arena_get dup @asulock @aculock @acsfd @acsmem