svn commit: trunk/uClibc/libc/stdlib/malloc
vapier at uclibc.org
vapier at uclibc.org
Fri Apr 13 18:01:21 UTC 2007
Author: vapier
Date: 2007-04-13 11:01:21 -0700 (Fri, 13 Apr 2007)
New Revision: 18427
Log:
fix up malloc debug building
Modified:
trunk/uClibc/libc/stdlib/malloc/free.c
trunk/uClibc/libc/stdlib/malloc/heap.h
trunk/uClibc/libc/stdlib/malloc/heap_alloc.c
trunk/uClibc/libc/stdlib/malloc/heap_alloc_at.c
trunk/uClibc/libc/stdlib/malloc/heap_debug.c
trunk/uClibc/libc/stdlib/malloc/heap_free.c
trunk/uClibc/libc/stdlib/malloc/malloc.c
trunk/uClibc/libc/stdlib/malloc/malloc.h
trunk/uClibc/libc/stdlib/malloc/malloc_debug.c
trunk/uClibc/libc/stdlib/malloc/realloc.c
Changeset:
Modified: trunk/uClibc/libc/stdlib/malloc/free.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/free.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/free.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/heap.h
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/heap.h 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/heap.h 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/heap_alloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/heap_alloc.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/heap_alloc.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/heap_alloc_at.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/heap_alloc_at.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/heap_alloc_at.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/heap_debug.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/heap_debug.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/heap_debug.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
@@ -15,9 +15,11 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
+#include <unistd.h>
libc_hidden_proto(vfprintf)
libc_hidden_proto(fprintf)
+libc_hidden_proto(_exit)
#include "malloc.h"
#include "heap.h"
@@ -66,7 +68,7 @@
/* Output an error message to stderr, and exit. STR is printed with the
failure message. */
-static void
+static void attribute_noreturn
__heap_check_failure (struct heap *heap, struct heap_free_area *fa,
const char *str, char *fmt, ...)
{
@@ -81,13 +83,13 @@
vfprintf (stderr, fmt, val);
va_end (val);
- __putc ('\n', stderr);
+ fprintf (stderr, "\n");
__malloc_debug_set_indent (0);
__malloc_debug_printf (1, "heap dump:");
__heap_dump_freelist (heap);
- __exit (22);
+ _exit (22);
}
/* Do some consistency checks on HEAP. If they fail, output an error
Modified: trunk/uClibc/libc/stdlib/malloc/heap_free.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/heap_free.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/heap_free.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/malloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/malloc.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/malloc.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/malloc.h
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/malloc.h 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/malloc.h 2007-04-13 18:01:21 UTC (rev 18427)
@@ -84,7 +84,6 @@
to stderr, when the variable __malloc_mmb_debug is set to true. */
#ifdef MALLOC_MMB_DEBUGGING
# include <stdio.h>
-extern int __putc(int c, FILE *stream) attribute_hidden;
extern int __malloc_mmb_debug;
# define MALLOC_MMB_DEBUG(indent, fmt, args...) \
Modified: trunk/uClibc/libc/stdlib/malloc/malloc_debug.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/malloc_debug.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/malloc_debug.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
Modified: trunk/uClibc/libc/stdlib/malloc/realloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/realloc.c 2007-04-13 16:32:26 UTC (rev 18426)
+++ trunk/uClibc/libc/stdlib/malloc/realloc.c 2007-04-13 18:01:21 UTC (rev 18427)
@@ -7,7 +7,7 @@
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License. See the file COPYING.LIB in the main
* directory of this archive for more details.
- *
+ *
* Written by Miles Bader <miles at gnu.org>
*/
More information about the uClibc-cvs
mailing list