X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fimalloc.c;h=d93ea3b3f51889de44d14cb85b1619e1bdc06744;hb=886253fb90810e512cacf4f02694645ead7a22e0;hp=8c15b7e3201bb35a1e8268ab73c3979a2b1225b0;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index 8c15b7e..d93ea3b 100644
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: imalloc.c,v $
- * Revision 1.4  1995-09-04 12:33:26  adam
+ * Revision 1.8  1999-02-02 14:50:08  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.7  1997/10/27 14:27:13  adam
+ * Minor changes.
+ *
+ * Revision 1.6  1996/10/29 13:57:25  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.5  1996/05/14 11:33:41  adam
+ * MEMDEBUG turned off by default.
+ *
+ * Revision 1.4  1995/09/04  12:33:26  adam
  * Various cleanup. YAZ util used instead.
  *
  * Revision 1.3  1994/09/27  16:31:19  adam
@@ -22,10 +34,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include "imalloc.h"
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 #define MAG1 0x8fe1
 #define MAG2 0x91
 #define MAG3 0xee
@@ -38,7 +50,7 @@ int  free_calls  = 0;
 
 void *imalloc (size_t size)
 {
-#ifdef MEMDEBUG
+#if MEMDEBUG
     size_t words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
     char *p = (char *)xmalloc( words*sizeof(unsigned) );
     if( !p )
@@ -63,7 +75,7 @@ void *imalloc (size_t size)
 
 void *icalloc (size_t size)
 {
-#ifdef MEMDEBUG
+#if MEMDEBUG
     unsigned words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
     char *p = (char *) xcalloc( words*sizeof(unsigned), 1 );
     if( !p )
@@ -79,16 +91,16 @@ void *icalloc (size_t size)
     ++alloc_calls;
     return (void *)p;
 #else
-    void *p = (void) xcalloc( size, 1 );
+    void *p = (void *) xcalloc( size, 1 );
     if( !p )
         logf (LOG_FATAL, "Out of memory (icalloc)" );
     return p;
 #endif
 }
 
-#ifdef MEMDEBUG
-void i_free (void *p)
+void ifree (void *p)
 {
+#if MEMDEBUG
     size_t size;
     if( !p )
         return;
@@ -104,18 +116,12 @@ void i_free (void *p)
     if( alloc < 0L )
         logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
     xfree( (unsigned *) p-2 );
-}
 #else
-#ifndef ANSI
-void i_free (void *p)
-{
-    if (p)
-        xfree( p );
-}
-#endif
+    xfree (p);
 #endif
+}
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 void imemstat (void)
 {
     fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",