diff mbox

localedef: Do not compile with mcheck

Message ID 20160510143705.427EE41C38D19@oldenburg.str.redhat.com
State New
Headers show

Commit Message

Florian Weimer May 10, 2016, 2:37 p.m. UTC
__malloc_initialize_hook is deprecated.

2016-05-10  Florian Weimer  <fweimer@redhat.com>

	Do not use mcheck in localedef.
	* locale/programs/localedef.c (turn_on_mcheck)
	(__malloc_initialize_hook): Remove.

Comments

Mike Frysinger May 10, 2016, 5:56 p.m. UTC | #1
On 10 May 2016 16:37, Florian Weimer wrote:
> 2016-05-10  Florian Weimer  <fweimer@redhat.com>
> 
> 	Do not use mcheck in localedef.
> 	* locale/programs/localedef.c (turn_on_mcheck)
> 	(__malloc_initialize_hook): Remove.

i'm fine with the change, but this changelog entry confuses me.
what's with the first line summary ?
shouldn't there be something at the end of the 2nd line like ": Delete." ?
-mike
Florian Weimer May 10, 2016, 6:43 p.m. UTC | #2
On 05/10/2016 07:56 PM, Mike Frysinger wrote:
> On 10 May 2016 16:37, Florian Weimer wrote:
>> 2016-05-10  Florian Weimer  <fweimer@redhat.com>
>>
>> 	Do not use mcheck in localedef.
>> 	* locale/programs/localedef.c (turn_on_mcheck)
>> 	(__malloc_initialize_hook): Remove.
>
> i'm fine with the change, but this changelog entry confuses me.
> what's with the first line summary ?
> shouldn't there be something at the end of the 2nd line like ": Delete." ?

It's the GNU standard way of line wrapping in ChangeLogs:

<https://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html#Style-of-Change-Logs>

(Search for “keyboard.c”.)

Emacs produces this automatically.

Florian
diff mbox

Patch

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 6becd9a..bfc5d22 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -24,7 +24,6 @@ 
 #include <fcntl.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -634,14 +633,3 @@  cannot open locale definition file `%s'"), result->name));
 
   return result;
 }
-
-static void
-turn_on_mcheck (void)
-{
-  /* Enable `malloc' debugging.  */
-  mcheck (NULL);
-  /* Use the following line for a more thorough but much slower testing.  */
-  /* mcheck_pedantic (NULL); */
-}
-
-void (*__malloc_initialize_hook) (void) = turn_on_mcheck;