projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes.
[idzebra-moved-to-github.git]
/
dfa
/
imalloc.c
diff --git
a/dfa/imalloc.c
b/dfa/imalloc.c
index
8c15b7e
..
43a6657
100644
(file)
--- a/
dfa/imalloc.c
+++ b/
dfa/imalloc.c
@@
-1,10
+1,16
@@
/*
/*
- * 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 $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: imalloc.c,v $
- * Revision 1.4 1995-09-04 12:33:26 adam
+ * Revision 1.6 1996-10-29 13:57:25 adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * 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
* Various cleanup. YAZ util used instead.
*
* Revision 1.3 1994/09/27 16:31:19 adam
@@
-22,10
+28,10
@@
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
-#include <alexutil.h>
+#include <zebrautl.h>
#include "imalloc.h"
#include "imalloc.h"
-#ifdef MEMDEBUG
+#if MEMDEBUG
#define MAG1 0x8fe1
#define MAG2 0x91
#define MAG3 0xee
#define MAG1 0x8fe1
#define MAG2 0x91
#define MAG3 0xee
@@
-38,7
+44,7
@@
int free_calls = 0;
void *imalloc (size_t size)
{
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 )
size_t words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
char *p = (char *)xmalloc( words*sizeof(unsigned) );
if( !p )
@@
-63,7
+69,7
@@
void *imalloc (size_t size)
void *icalloc (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 )
unsigned words = (4*sizeof(unsigned) -1 + size)/sizeof(unsigned);
char *p = (char *) xcalloc( words*sizeof(unsigned), 1 );
if( !p )
@@
-79,14
+85,14
@@
void *icalloc (size_t size)
++alloc_calls;
return (void *)p;
#else
++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
}
if( !p )
logf (LOG_FATAL, "Out of memory (icalloc)" );
return p;
#endif
}
-#ifdef MEMDEBUG
+#if MEMDEBUG
void i_free (void *p)
{
size_t size;
void i_free (void *p)
{
size_t size;
@@
-105,17
+111,9
@@
void i_free (void *p)
logf (LOG_FATAL,"Internal: ifree(%u) negative alloc.", size );
xfree( (unsigned *) p-2 );
}
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
#endif
-#ifdef MEMDEBUG
+#if MEMDEBUG
void imemstat (void)
{
fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",
void imemstat (void)
{
fprintf( stdout, "imalloc: calls malloc/free %d/%d, ",