From c332d3fe0ad55f5dbf6705ece399eaf8a7e9ac96 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 14 May 1996 11:33:40 +0000
Subject: [PATCH] MEMDEBUG turned off by default.

---
 dfa/Makefile  |   14 +++++++-------
 dfa/imalloc.c |   27 +++++++++++----------------
 dfa/imalloc.h |   14 ++++++--------
 dfa/lexer.c   |   11 +++++++----
 4 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/dfa/Makefile b/dfa/Makefile
index 303d85f..610941f 100644
--- a/dfa/Makefile
+++ b/dfa/Makefile
@@ -1,19 +1,19 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1996, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.13 1995-12-04 14:20:05 adam Exp $
+# $Id: Makefile,v 1.14 1996-05-14 11:33:40 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
 
-YAZLIB=-lyaz
-YAZINC=
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
 
 INCLUDE=-I../include $(YAZINC)
 TPROG1=agrep
 TPROG2=lexer
 TPROG3=grepper
-DEFS=$(INCLUDE) -DMEMDEBUG=1
+DEFS=$(INCLUDE)
 LIB=../lib/dfa.a 
 PO = dfa.o imalloc.o states.o set.o bset.o
 CPP=$(CC) -E
@@ -49,11 +49,11 @@ depend: depend2
 
 depend1:
 	sed '/^#Depend/q' <Makefile >Makefile.tmp
-	$(CPP) -M $(DEFS) *.c >>Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
 	mv -f Makefile.tmp Makefile
 
 depend2:
-	$(CPP) -M $(DEFS) *.c >.depend
+	$(CPP) $(DEFS) -M *.c >.depend
 
 ifeq (.depend,$(wildcard .depend))
 include .depend
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, ",
diff --git a/dfa/imalloc.h b/dfa/imalloc.h
index 6f58960..26deaf7 100644
--- a/dfa/imalloc.h
+++ b/dfa/imalloc.h
@@ -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.h,v $
- * Revision 1.1  1994-09-26 10:16:54  adam
+ * Revision 1.2  1996-05-14 11:33:41  adam
+ * MEMDEBUG turned off by default.
+ *
+ * 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 +16,7 @@
 void *imalloc        (size_t);
 void *icalloc        (size_t);
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 void  i_free         (void *);
 void  imemstat       (void);
 
@@ -25,12 +28,7 @@ extern int  free_calls;
 
 #else
 
-#ifdef ANSI
 #define ifree free
-#else
-void  i_free         (void *);
-#define ifree i_free
-#endif
 
 #endif
 
diff --git a/dfa/lexer.c b/dfa/lexer.c
index f42ebda..9684c71 100644
--- a/dfa/lexer.c
+++ b/dfa/lexer.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: lexer.c,v $
- * Revision 1.8  1995-09-28 09:18:54  adam
+ * Revision 1.9  1996-05-14 11:33:41  adam
+ * MEMDEBUG turned off by default.
+ *
+ * Revision 1.8  1995/09/28  09:18:54  adam
  * Removed various preprocessor defines.
  *
  * Revision 1.7  1995/09/04  12:33:27  adam
@@ -135,12 +138,12 @@ int main (int argc, char **argv)
                 return i;
             dfa_mkstate (dfa);
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
     imemstat();
 #endif
         }
     dfa_delete (&dfa);
-#ifdef MEMDEBUG
+#if MEMDEBUG
     imemstat();
 #endif
     if (!no)
-- 
1.7.10.4