X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fimalloc.c;fp=dfa%2Fimalloc.c;h=952eb7a940baa02ea5f56658586aa4cd27917e5d;hb=c332d3fe0ad55f5dbf6705ece399eaf8a7e9ac96;hp=8c15b7e3201bb35a1e8268ab73c3979a2b1225b0;hpb=276a6af7f9d8ef0ef2ffc3f25e639be148ca2c7c;p=idzebra-moved-to-github.git

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index 8c15b7e..952eb7a 100644
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: imalloc.c,v $
- * Revision 1.4  1995-09-04 12:33:26  adam
+ * 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
@@ -25,7 +28,7 @@
 #include <alexutil.h>
 #include "imalloc.h"
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 #define MAG1 0x8fe1
 #define MAG2 0x91
 #define MAG3 0xee
@@ -38,7 +41,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 +66,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,14 +82,14 @@ 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
+#if MEMDEBUG
 void i_free (void *p)
 {
     size_t size;
@@ -105,17 +108,9 @@ void i_free (void *p)
         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
 #endif
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 void imemstat (void)
 {
     fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",