From 1dbafa8950876388364252c908f290587a19f4b1 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 27 May 2006 13:38:49 +0000 Subject: [PATCH] Tidied up debugging messages --- src/core/malloc.c | 8 ++++---- src/net/ethernet.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/malloc.c b/src/core/malloc.c index b7f1ce3a..bf4a8a39 100644 --- a/src/core/malloc.c +++ b/src/core/malloc.c @@ -77,7 +77,7 @@ void * alloc_memblock ( size_t size, size_t align ) { */ size = ( size + MIN_MEMBLOCK_SIZE - 1 ) & ~( MIN_MEMBLOCK_SIZE - 1 ); align_mask = ( align - 1 ) | ( MIN_MEMBLOCK_SIZE - 1 ); - DBG ( "Allocating %zx (aligned %zx)\n", size, align ); + DBG ( "Allocating %#zx (aligned %#zx)\n", size, align ); /* Search through blocks for the first one with enough space */ list_for_each_entry ( block, &free_blocks, list ) { @@ -92,7 +92,7 @@ void * alloc_memblock ( size_t size, size_t align ) { pre = block; block = ( ( ( void * ) pre ) + pre_size ); post = ( ( ( void * ) block ) + size ); - DBG ( "[%p,%p) -> [%p,%p) + [%p,%p)\n", pre, + DBG ( "[%p,%p) -> [%p,%p) + [%p,%p)\n", pre, ( ( ( void * ) pre ) + pre->size ), pre, block, post, ( ( ( void * ) pre ) + pre->size ) ); /* If there is a "post" block, add it in to @@ -124,7 +124,7 @@ void * alloc_memblock ( size_t size, size_t align ) { } } - DBG ( "Failed to allocate %zx (aligned %zx)\n", size, align ); + DBG ( "Failed to allocate %#zx (aligned %#zx)\n", size, align ); return NULL; } @@ -261,7 +261,7 @@ void mdumpfree ( void ) { printf ( "Free block list:\n" ); list_for_each_entry ( block, &free_blocks, list ) { - printf ( "[%p,%p] (size %zx)\n", block, + printf ( "[%p,%p] (size %#zx)\n", block, ( ( ( void * ) block ) + block->size ), block->size ); } } diff --git a/src/net/ethernet.c b/src/net/ethernet.c index 88ca6c42..cadcb674 100644 --- a/src/net/ethernet.c +++ b/src/net/ethernet.c @@ -140,7 +140,7 @@ static const char * eth_ntoa ( const void *ll_addr ) { static char buf[18]; /* "00:00:00:00:00:00" */ uint8_t *eth_addr = ll_addr; - sprintf ( buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", + sprintf ( buf, "%02x:%02x:%02x:%02x:%02x:%02x", eth_addr[0], eth_addr[1], eth_addr[2], eth_addr[3], eth_addr[4], eth_addr[5] ); return buf;