Many public functions returns ZEBRA_RES rather than int to avoid

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

diff --git a/dfa/imalloc.c b/dfa/imalloc.c
index f21b197..cf1e504 100644 (file)
--- a/dfa/imalloc.c
+++ b/dfa/imalloc.c
@@ -1,6 +1,6 @@
-/* $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
+/* $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.
 
@@ -25,7 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <stdlib.h>
 
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/xmalloc.h>
 #include "imalloc.h"
 
 #if MEMDEBUG
@@ -45,7 +46,7 @@ void *imalloc (size_t size)
     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;
@@ -59,7 +60,7 @@ 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
 }
@@ -70,7 +71,7 @@ void *icalloc (size_t size)
     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;
@@ -84,7 +85,7 @@ void *icalloc (size_t size)
 #else
     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
 }
@@ -98,14 +99,14 @@ void ifree (void *p)
     ++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
     xfree (p);