X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fimalloc.c;h=a0a98f14c8b485670b185ec66b6fe3464e7bdba9;hb=25711769a3fb5c6bf0ab3eb9634bf74ba07dc48d;hp=64df1fe676519b7b64cc72c7d31799bab6cdacc1;hpb=ead74d0c3b9d76204494553c61854812eb69bbc7;p=idzebra-moved-to-github.git

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index 64df1fe..a0a98f1 100644
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: imalloc.c,v $
- * Revision 1.1  1994-09-26 10:16:54  adam
+ * 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.
  *
@@ -31,7 +37,7 @@ 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",
            size, alloc_calls, free_calls, alloc, max_alloc );
@@ -45,7 +51,7 @@ 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)" );
     return p;
@@ -56,7 +62,7 @@ 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",
            size, alloc_calls, free_calls, alloc, max_alloc );
@@ -70,7 +76,7 @@ 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)" );
     return p;
@@ -94,14 +100,14 @@ void i_free (void *p)
     alloc -= size;
     if( alloc < 0L )
         log (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
-    free( (unsigned *) p-2 );
+    xfree( (unsigned *) p-2 );
 }
 #else
 #ifndef ANSI
 void i_free (void *p)
 {
     if (p)
-        free( p );
+        xfree( p );
 }
 #endif
 #endif