-# 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
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
/*
- * 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
#include <alexutil.h>
#include "imalloc.h"
-#ifdef MEMDEBUG
+#if MEMDEBUG
#define MAG1 0x8fe1
#define MAG2 0x91
#define MAG3 0xee
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 )
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 )
++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;
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, ",
/*
- * 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.
*
void *imalloc (size_t);
void *icalloc (size_t);
-#ifdef MEMDEBUG
+#if MEMDEBUG
void i_free (void *);
void imemstat (void);
#else
-#ifdef ANSI
#define ifree free
-#else
-void i_free (void *);
-#define ifree i_free
-#endif
#endif
/*
- * 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
return i;
dfa_mkstate (dfa);
-#ifdef MEMDEBUG
+#if MEMDEBUG
imemstat();
#endif
}
dfa_delete (&dfa);
-#ifdef MEMDEBUG
+#if MEMDEBUG
imemstat();
#endif
if (!no)