X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fxmalloc.h;h=ac779172228cf4ac3aef8c41febb966777014769;hb=cdea632bd515af06beaa311c8569180da1e082da;hp=0c7df51c446a2a4af212c36334838d3d9db50a1f;hpb=068a5a7412f492019b4d6f5e89158098d44368f7;p=yaz-moved-to-github.git

diff --git a/include/xmalloc.h b/include/xmalloc.h
index 0c7df51..ac77917 100644
--- a/include/xmalloc.h
+++ b/include/xmalloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -24,7 +24,13 @@
  * OF THIS SOFTWARE.
  *
  * $Log: xmalloc.h,v $
- * Revision 1.4  1997-10-31 12:20:08  adam
+ * Revision 1.6  1999-07-13 13:24:53  adam
+ * Updated memory debugging memory allocatation routines.
+ *
+ * Revision 1.5  1998/07/20 12:36:22  adam
+ * Minor changes.
+ *
+ * Revision 1.4  1997/10/31 12:20:08  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.
@@ -76,27 +82,24 @@
 
 #include <yconfig.h>
 
-#define TRACE_XMALLOC 0
-
-#ifndef TRACE_XMALLOC
-#define TRACE_XMALLOC 0
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-YAZ_EXPORT void *xrealloc_f (void *o, size_t size, char *file, int line);
-YAZ_EXPORT void *xmalloc_f (size_t size, char *file, int line);
-YAZ_EXPORT void *xcalloc_f (size_t nmemb, size_t size, char *file, int line);
-YAZ_EXPORT char *xstrdup_f (const char *, char *file, int line);
-YAZ_EXPORT void xfree_f (void *p, char *file, int line);
-
 #define xrealloc(o, x) xrealloc_f(o, x, __FILE__, __LINE__)
 #define xmalloc(x) xmalloc_f(x, __FILE__, __LINE__)
 #define xcalloc(x,y) xcalloc_f(x,y, __FILE__, __LINE__)
 #define xfree(x) xfree_f(x, __FILE__, __LINE__)
 #define xstrdup(s) xstrdup_f(s, __FILE__, __LINE__)
+#define xmalloc_trav(s) xmalloc_trav_f(s, __FILE__, __LINE__)
+    
+YAZ_EXPORT void *xrealloc_f (void *o, size_t size, const char *file, int line);
+YAZ_EXPORT void *xmalloc_f (size_t size, const char *file, int line);
+YAZ_EXPORT void *xcalloc_f (size_t nmemb, size_t size,
+			    const char *file, int line);
+YAZ_EXPORT char *xstrdup_f (const char *p, const char *file, int line);
+YAZ_EXPORT void xfree_f (void *p, const char *file, int line);
+YAZ_EXPORT void xmalloc_trav_f(const char *s, const char *file, int line);
 
 #ifdef __cplusplus
 }