X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fxmalloc.c;h=4900a50d3819953c7d6a84452d2a646d7d01887f;hp=f1382292d58379461079199b4d9ff33529d62bf9;hb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;hpb=b09357c410fba556fbf06e6065aadf78a04f5671

diff --git a/util/xmalloc.c b/util/xmalloc.c
index f138229..4900a50 100644
--- a/util/xmalloc.c
+++ b/util/xmalloc.c
@@ -1,66 +1,25 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2001, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: xmalloc.c,v $
- * Revision 1.9  1999-09-10 08:58:32  adam
- * Set TRACE_XMALLOC to 1.
- *
- * Revision 1.8  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.7  1999/07/13 13:24:53  adam
- * Updated memory debugging memory allocatation routines.
- *
- * Revision 1.6  1998/02/11 11:53:36  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.5  1997/10/31 12:20:09  adam
- * Improved memory debugging for xmalloc/nmem.c. References to NMEM
- * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
- * Bug fix: missing fclose in data1_read_espec1.
- *
- * Revision 1.4  1996/07/03 13:21:36  adam
- * Function xfree_f checks for NULL pointer.
- *
- * Revision 1.3  1995/12/05  15:08:44  adam
- * Fixed verbose of xrealloc.
- *
- * Revision 1.2  1995/12/05  11:08:37  adam
- * More verbose malloc routines.
- *
- * Revision 1.1  1995/11/01  11:56:53  quinn
- * Added Xmalloc.
- *
- * Revision 1.6  1995/10/16  14:03:11  quinn
- * Changes to support element set names and espec1
- *
- * Revision 1.5  1995/09/04  12:34:06  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.4  1994/10/05  10:16:16  quinn
- * Added xrealloc. Fixed bug in log.
- *
- * Revision 1.3  1994/09/26  16:31:37  adam
- * Added xcalloc_f.
- *
- * Revision 1.2  1994/08/18  08:23:26  adam
- * Res.c now use handles. xmalloc defines xstrdup.
- *
- * Revision 1.1  1994/08/17  13:37:54  adam
- * xmalloc.c added to util.
- *
+ * $Id: xmalloc.c,v 1.15 2001-11-13 23:00:43 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <log.h>
-#include <xmalloc.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
 
+#ifndef TRACE_XMALLOC
 #define TRACE_XMALLOC 1
+#endif
 
 #if TRACE_XMALLOC > 1
 
@@ -229,7 +188,7 @@ void xmalloc_trav_d(const char *file, int line)
     while (dinfo)
     {
 	yaz_log (LOG_LOG, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
-	      dinfo+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
+	      ((char*) dinfo)+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
 	size += dinfo->len;
 	dinfo = dinfo->next;
     }