X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fimalloc.c;h=cf1e50491ff393a2c63d401bc217c06fcd51b090;hp=8c15b7e3201bb35a1e8268ab73c3979a2b1225b0;hb=49d0ee122a9f86ec2967b577dcc297c501785edd;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index 8c15b7e..cf1e504 100644
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -1,31 +1,35 @@
-/*
- * Copyright (C) 1994, 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
- * 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.13 2005-04-15 10:47:47 adam Exp $
+   Copyright (C) 1995-2005
+   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 <idzebra/util.h>
+#include <yaz/xmalloc.h>
 #include "imalloc.h"
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 #define MAG1 0x8fe1
 #define MAG2 0x91
 #define MAG3 0xee
@@ -38,11 +42,11 @@ 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 )
-        logf (LOG_FATAL, "No memory: imalloc(%u); c/f %d/%d; %ld/%ld",
+        yaz_log (YLOG_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;
@@ -56,18 +60,18 @@ void *imalloc (size_t size)
 #else
     void *p = (void *)xmalloc( size );
     if( !p )
-        logf (LOG_FATAL, "Out of memory (imalloc)" );
+        yaz_log (YLOG_FATAL, "Out of memory (imalloc)" );
     return p;
 #endif
 }
 
 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 )
-        logf (LOG_FATAL, "No memory: icalloc(%u); c/f %d/%d; %ld/%ld",
+        yaz_log (YLOG_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;
@@ -79,43 +83,37 @@ 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)" );
+        yaz_log (YLOG_FATAL, "Out of memory (icalloc)" );
     return p;
 #endif
 }
 
-#ifdef MEMDEBUG
-void i_free (void *p)
+void ifree (void *p)
 {
+#if MEMDEBUG
     size_t size;
     if( !p )
         return;
     ++free_calls;
     size = (-2)[(unsigned *) p];
     if( (-1)[(unsigned *) p] != MAG1 )
-        logf (LOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
+        yaz_log (YLOG_FATAL,"Internal: ifree(%u) magic 1 corrupted", size );
     if( size[(unsigned char *) p] != MAG2 )
-        logf (LOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
+        yaz_log (YLOG_FATAL,"Internal: ifree(%u) magic 2 corrupted", size );
     if( (size+1)[(unsigned char *) p] != MAG3 )
-        logf (LOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
+        yaz_log (YLOG_FATAL,"Internal: ifree(%u) magic 3 corrupted", size );
     alloc -= size;
     if( alloc < 0L )
-        logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
+        yaz_log (YLOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
     xfree( (unsigned *) p-2 );
-}
 #else
-#ifndef ANSI
-void i_free (void *p)
-{
-    if (p)
-        xfree( p );
-}
-#endif
+    xfree (p);
 #endif
+}
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
 void imemstat (void)
 {
     fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",