Don't declare __malloc_check_init in <malloc.h> (bug 23352)

Message ID mvmftnfcl5p.fsf@suse.de
State New
Headers show
Series
  • Don't declare __malloc_check_init in <malloc.h> (bug 23352)
Related show

Commit Message

Andreas Schwab July 9, 2019, 2:55 p.m.
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(-)

-- 
2.22.0

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Comments

Florian Weimer July 9, 2019, 3:40 p.m. | #1
* 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

Patch

diff --git a/include/malloc.h b/include/malloc.h
index d4cd9a5ffc..70d32c7c84 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -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;
 
diff --git a/malloc/malloc-internal.h b/malloc/malloc-internal.h
index 591ec4528a..54d90f901b 100644
--- a/malloc/malloc-internal.h
+++ b/malloc/malloc-internal.h
@@ -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 */
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 523f1b1af5..70d8282bdc 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.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 */
diff --git a/manual/memory.texi b/manual/memory.texi
index a1435aad1a..b565dd69f2 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -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