X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fxmalloc.c;h=96bc73a7f80d029c06929786e13e6dfeb20512e4;hb=4fd9395530e56f0b5d2061d52a120b1cc4a1fade;hp=4900a50d3819953c7d6a84452d2a646d7d01887f;hpb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;p=yaz-moved-to-github.git diff --git a/util/xmalloc.c b/util/xmalloc.c index 4900a50..96bc73a 100644 --- a/util/xmalloc.c +++ b/util/xmalloc.c @@ -1,9 +1,9 @@ /* - * Copyright (C) 1994-2001, Index Data + * Copyright (C) 1994-2003, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * - * $Id: xmalloc.c,v 1.15 2001-11-13 23:00:43 adam Exp $ + * $Id: xmalloc.c,v 1.18 2003-01-06 08:20:28 adam Exp $ */ #if HAVE_CONFIG_H @@ -184,15 +184,15 @@ void xmalloc_trav_d(const char *file, int line) size_t size = 0; struct dmalloc_info *dinfo = dmalloc_list; - yaz_log (LOG_LOG, "malloc_trav %s:%d", file, line); + yaz_log (LOG_MALLOC, "malloc_trav %s:%d", file, line); while (dinfo) { - yaz_log (LOG_LOG, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line, + yaz_log (LOG_MALLOC, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line, ((char*) dinfo)+sizeof(*dinfo)+4*sizeof(char), dinfo->len); size += dinfo->len; dinfo = dinfo->next; } - yaz_log (LOG_LOG, "total bytes %ld", (long) size); + yaz_log (LOG_MALLOC, "total bytes %ld", (long) size); } #else @@ -214,7 +214,7 @@ void *xrealloc_f (void *o, size_t size, const char *file, int line) void *p = xrealloc_d (o, size, file, line); #if TRACE_XMALLOC - yaz_log (LOG_DEBUG, + yaz_log (LOG_MALLOC, "%s:%d: xrealloc(s=%d) %p -> %p", file, line, size, o, p); #endif if (!p) @@ -231,7 +231,7 @@ void *xmalloc_f (size_t size, const char *file, int line) void *p = xmalloc_d (size, file, line); #if TRACE_XMALLOC - yaz_log (LOG_DEBUG, "%s:%d: xmalloc(s=%d) %p", file, line, size, p); + yaz_log (LOG_MALLOC, "%s:%d: xmalloc(s=%d) %p", file, line, size, p); #endif if (!p) { @@ -245,7 +245,7 @@ void *xcalloc_f (size_t nmemb, size_t size, const char *file, int line) { void *p = xcalloc_d (nmemb, size, file, line); #if TRACE_XMALLOC - yaz_log (LOG_DEBUG, "%s:%d: xcalloc(s=%d) %p", file, line, size, p); + yaz_log (LOG_MALLOC, "%s:%d: xcalloc(s=%d) %p", file, line, size, p); #endif if (!p) { @@ -259,7 +259,7 @@ char *xstrdup_f (const char *s, const char *file, int line) { char *p = (char *)xmalloc_d (strlen(s)+1, file, line); #if TRACE_XMALLOC - yaz_log (LOG_DEBUG, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p); + yaz_log (LOG_MALLOC, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p); #endif strcpy (p, s); return p; @@ -271,7 +271,7 @@ void xfree_f(void *p, const char *file, int line) return ; #if TRACE_XMALLOC if (p) - yaz_log (LOG_DEBUG, "%s:%d: xfree %p", file, line, p); + yaz_log (LOG_MALLOC, "%s:%d: xfree %p", file, line, p); #endif xfree_d(p, file, line); }