X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fxmalloc.c;h=16469d7263dbb54c4f16013ed77180eea573b0de;hb=aa5f63565232666005bef5c83f2d500d8ce9dfb4;hp=b5bccd24522078db7cb127cd34fa30f1ee3dfdfc;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/util/xmalloc.c b/util/xmalloc.c
index b5bccd2..16469d7 100644
--- a/util/xmalloc.c
+++ b/util/xmalloc.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2000, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmalloc.c,v $
- * Revision 1.10  1999-11-30 13:47:12  adam
+ * Revision 1.12  2001-09-24 21:51:56  adam
+ * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
+ * and yaz_z3950oid_to_str.
+ *
+ * Revision 1.11  2000/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10  1999/11/30 13:47:12  adam
  * Improved installation. Moved header files to include/yaz.
  *
  * Revision 1.9  1999/09/10 08:58:32  adam
@@ -56,6 +63,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -63,7 +74,7 @@
 #include <yaz/log.h>
 #include <yaz/xmalloc.h>
 
-#define TRACE_XMALLOC 1
+#define TRACE_XMALLOC 2
 
 #if TRACE_XMALLOC > 1
 
@@ -232,7 +243,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;
     }