From patchwork Tue Jul 9 14:55:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 33630 Received: (qmail 129167 invoked by alias); 9 Jul 2019 14:55:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 128990 invoked by uid 89); 9 Jul 2019 14:55:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=shutdown X-HELO: mx1.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Don't declare __malloc_check_init in (bug 23352) X-Yow: I'm shaving!! I'M SHAVING!! Date: Tue, 09 Jul 2019 16:55:30 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2.90 (gnu/linux) MIME-Version: 1.0 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(-) 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