From 94b434c6798ad1a06a8f9c7c146512fafc4586a5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 13 Oct 2009 22:07:30 +0200 Subject: [PATCH] Convert some old %x into %p for pointers --- bacula/src/lib/smartall.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/src/lib/smartall.c b/bacula/src/lib/smartall.c index be56a417a1..2757ebb4a9 100644 --- a/bacula/src/lib/smartall.c +++ b/bacula/src/lib/smartall.c @@ -147,7 +147,7 @@ static void *smalloc(const char *fname, int lineno, unsigned int nbytes) } else { Emsg0(M_ABORT, 0, _("Out of memory\n")); } - Dmsg4(1150, "smalloc %d at %x from %s:%d\n", nbytes, buf, fname, lineno); + Dmsg4(1150, "smalloc %d at %p from %s:%d\n", nbytes, buf, fname, lineno); #if SMALLOC_SANITY_CHECK > 0 if (sm_bytes > SMALLOC_SANITY_CHECK) { Emsg0(M_ABORT, 0, _("Too much memory used.")); @@ -289,7 +289,7 @@ void *sm_realloc(const char *fname, int lineno, void *ptr, unsigned int size) void *buf; char *cp = (char *) ptr; - Dmsg4(400, "sm_realloc %s:%d 0x%x %d\n", fname, lineno, ptr, size); + Dmsg4(400, "sm_realloc %s:%d %p %d\n", fname, lineno, ptr, size); if (size <= 0) { e_msg(fname, lineno, M_ABORT, 0, _("sm_realloc size: %d\n"), size); } @@ -329,7 +329,7 @@ void *sm_realloc(const char *fname, int lineno, void *ptr, unsigned int size) /* All done. Free and dechain the original buffer. */ sm_free(fname, lineno, ptr); } - Dmsg4(150, _("sm_realloc %d at %x from %s:%d\n"), size, buf, fname, lineno); + Dmsg4(150, _("sm_realloc %d at %p from %s:%d\n"), size, buf, fname, lineno); return buf; } @@ -360,7 +360,7 @@ void *actuallycalloc(unsigned int nelem, unsigned int elsize) void *actuallyrealloc(void *ptr, unsigned int size) { - Dmsg2(400, "Actuallyrealloc 0x%x %d\n", ptr, size); + Dmsg2(400, "Actuallyrealloc %p %d\n", ptr, size); return realloc(ptr, size); } @@ -560,7 +560,7 @@ void * operator new(size_t size) void operator delete(void *buf) { -// Dmsg1(000, "free called 0x%x\n", buf); +// Dmsg1(000, "free called %p\n", buf); sm_free(__FILE__, __LINE__, buf); } #endif -- 2.39.5