diff options
Diffstat (limited to 'src/Type1/t1malloc.c')
-rw-r--r-- | src/Type1/t1malloc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Type1/t1malloc.c b/src/Type1/t1malloc.c index 08a3a8b..81ff220 100644 --- a/src/Type1/t1malloc.c +++ b/src/Type1/t1malloc.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.11 2002/02/18 20:51:57 herrb Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.12 2004/01/23 03:55:25 dawes Exp $ */ /* MALLOC CWEB V0004 LOTS */ /* :h1.MALLOC - Fast Memory Allocation @@ -258,13 +258,13 @@ If we have too many uncombined blocks, call combine() to combine one. if (++uncombined > MAXUNCOMBINED) { combine(); if (mallocdebug) { - printf("xiFree(%p) with combine, ", addr); + printf("xiFree(%p) with combine, ", (void *)addr); dumpchain(); } } else { if (mallocdebug) { - printf("xiFree(%p), ", addr); + printf("xiFree(%p), ", (void *)addr); dumpchain(); } } @@ -470,7 +470,8 @@ only to be "unhook"ed: unhook(p); uncombined--; if (mallocdebug) { - printf("fast xiMalloc(%ld) = %p, ", size, p); + printf("fast xiMalloc(%ld) = %p, ", size, + (void *)p); dumpchain(); } AvailableWords += size; /* decreases AvailableWords */ @@ -527,7 +528,7 @@ flag that this block is allocated: area[size - 1] = area[0] = - size; if (mallocdebug) { - printf("slow xiMalloc(%ld) @ %p, ", size, area); + printf("slow xiMalloc(%ld) @ %p, ", size, (void *)area); dumpchain(); } whocalledme(area, &Size); @@ -646,7 +647,7 @@ dumpchain(void) if (--i < 0) Abort("too many uncombined areas"); size = p->size; - printf(". . . area @ %p, size = %ld\n", p, -size); + printf(". . . area @ %p, size = %ld\n", (void *)p, -size); if (size >= 0 || size != ((int *) p)[-1 - size]) Abort("dumpchain: bad size"); if (p->back != back) @@ -656,7 +657,7 @@ dumpchain(void) printf("DUMPING COMBINED FREE LIST:\n"); for (; p != &lastfree; p = p->fore) { size = p->size; - printf(". . . area @ %p, size = %ld\n", p, size); + printf(". . . area @ %p, size = %ld\n", (void *)p, size); if (size <= 0 || size != ((int *) p)[size - 1]) Abort("dumpchain: bad size"); if (p->back != back) |