Minor changes.

[idzebra-moved-to-github.git] / dfa / imalloc.c

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index 64df1fe..8c15b7e 100644 (file)
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: imalloc.c,v $
- * Revision 1.1  1994-09-26 10:16:54  adam
+ * 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
+ * First version of grepper: grep with error correction.
+ *
+ * Revision 1.2  1994/09/26  16:30:56  adam
+ * Minor changes. imalloc uses xmalloc now.
+ *
+ * Revision 1.1  1994/09/26  10:16:54  adam
  * First version of dfa module in alex. This version uses yacc to parse
  * regular expressions. This should be hand-made instead.
  *
@@ -13,7 +22,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <util.h>
+#include <alexutil.h>
 #include "imalloc.h"
 
 #ifdef MEMDEBUG
@@ -31,9 +40,9 @@ void *imalloc (size_t size)
 {
 #ifdef MEMDEBUG
     size_t words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
-    char *p = (char *)malloc( words*sizeof(unsigned) );
+    char *p = (char *)xmalloc( words*sizeof(unsigned) );
     if( !p )
-        log (LOG_FATAL, "No memory: imalloc(%u); c/f %d/%d; %ld/%ld",
+        logf (LOG_FATAL, "No memory: imalloc(%u); c/f %d/%d; %ld/%ld",
            size, alloc_calls, free_calls, alloc, max_alloc );
     *((unsigned *)p) = size;
     ((unsigned *)p)[1] = MAG1;
@@ -45,9 +54,9 @@ void *imalloc (size_t size)
     ++alloc_calls;
     return (void *) p;
 #else
-    void *p = (void *)malloc( size );
+    void *p = (void *)xmalloc( size );
     if( !p )
-        log (LOG_FATAL, "Out of memory (imalloc)" );
+        logf (LOG_FATAL, "Out of memory (imalloc)" );
     return p;
 #endif
 }
@@ -56,9 +65,9 @@ void *icalloc (size_t size)
 {
 #ifdef MEMDEBUG
     unsigned words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
-    char *p = (char *) calloc( words*sizeof(unsigned), 1 );
+    char *p = (char *) xcalloc( words*sizeof(unsigned), 1 );
     if( !p )
-        log (LOG_FATAL, "No memory: icalloc(%u); c/f %d/%d; %ld/%ld",
+        logf (LOG_FATAL, "No memory: icalloc(%u); c/f %d/%d; %ld/%ld",
            size, alloc_calls, free_calls, alloc, max_alloc );
     ((unsigned *)p)[0] = size;
     ((unsigned *)p)[1] = MAG1;
@@ -70,9 +79,9 @@ void *icalloc (size_t size)
     ++alloc_calls;
     return (void *)p;
 #else
-    void p = (void) calloc( size, 1 );
+    void *p = (void) xcalloc( size, 1 );
     if( !p )
-        log (LOG_FATAL, "Out of memory (icalloc)" );
+        logf (LOG_FATAL, "Out of memory (icalloc)" );
     return p;
 #endif
 }
@@ -86,22 +95,22 @@ void i_free (void *p)
     ++free_calls;
     size = (-2)[(unsigned *) p];
     if( (-1)[(unsigned *) p] != MAG1 )
-        log (LOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
+        logf (LOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
     if( size[(unsigned char *) p] != MAG2 )
-        log (LOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
+        logf (LOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
     if( (size+1)[(unsigned char *) p] != MAG3 )
-        log (LOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
+        logf (LOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
     alloc -= size;
     if( alloc < 0L )
-        log (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
-    free( (unsigned *) p-2 );
+        logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
+    xfree( (unsigned *) p-2 );
 }
 #else
 #ifndef ANSI
 void i_free (void *p)
 {
     if (p)
-        free( p );
+        xfree( p );
 }
 #endif
 #endif