Towards GPL

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

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index 952eb7a..f21b197 100644 (file)
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -1,31 +1,31 @@
-/*
- * Copyright (C) 1994-1996, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: imalloc.c,v $
- * 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
- * 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.
- *
- */
+/* $Id: imalloc.c,v 1.9 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include "imalloc.h"
 
 #if MEMDEBUG
@@ -89,9 +89,9 @@ void *icalloc (size_t size)
 #endif
 }
 
-#if MEMDEBUG
-void i_free (void *p)
+void ifree (void *p)
 {
+#if MEMDEBUG
     size_t size;
     if( !p )
         return;
@@ -107,8 +107,10 @@ void i_free (void *p)
     if( alloc < 0L )
         logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
     xfree( (unsigned *) p-2 );
-}
+#else
+    xfree (p);
 #endif
+}
 
 #if MEMDEBUG
 void imemstat (void)