projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed simple bug in the code to handle untagged choice elements.
[yaz-moved-to-github.git]
/
odr
/
odr_mem.c
diff --git
a/odr/odr_mem.c
b/odr/odr_mem.c
index
95a8135
..
bc48fcd
100644
(file)
--- a/
odr/odr_mem.c
+++ b/
odr/odr_mem.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_mem.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_mem.c,v $
- * Revision 1.3 1995-04-18 08:15:21 quinn
+ * Revision 1.5 1995-05-16 08:50:55 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4 1995/05/15 11:56:09 quinn
+ * More work on memory management.
+ *
+ * Revision 1.3 1995/04/18 08:15:21 quinn
* Added dynamic memory allocation on encoding (whew). Code is now somewhat
* neater. We'll make the same change for decoding one day.
*
* Added dynamic memory allocation on encoding (whew). Code is now somewhat
* neater. We'll make the same change for decoding one day.
*
@@
-19,6
+25,7
@@
#include <stdlib.h>
#include <odr.h>
#include <stdlib.h>
#include <odr.h>
+#include <dmalloc.h>
/* ------------------------ NIBBLE MEMORY ---------------------- */
/* ------------------------ NIBBLE MEMORY ---------------------- */
@@
-32,7
+39,7
@@
typedef struct odr_memblock
struct odr_memblock *next;
} odr_memblock;
struct odr_memblock *next;
} odr_memblock;
-static odr_memblock *freelist = 0;
+static odr_memblock *freelist = 0; /* global freelist */
static void free_block(odr_memblock *p)
{
static void free_block(odr_memblock *p)
{
@@
-40,6
+47,9
@@
static void free_block(odr_memblock *p)
freelist = p;
}
freelist = p;
}
+/*
+ * acquire a block with a minimum of size free bytes.
+ */
static odr_memblock *get_block(int size)
{
odr_memblock *r, *l;
static odr_memblock *get_block(int size)
{
odr_memblock *r, *l;
@@
-67,7
+77,10
@@
static odr_memblock *get_block(int size)
return r;
}
return r;
}
-void odr_release_mem(odr_memblock *p)
+/*
+ * Return p to the global freelist.
+ */
+void odr_release_mem(ODR_MEM p)
{
odr_memblock *t;
{
odr_memblock *t;
@@
-79,6
+92,17
@@
void odr_release_mem(odr_memblock *p)
}
}
}
}
+/*
+ * Extract the memory control block from o.
+ */
+ODR_MEM odr_extract_mem(ODR o)
+{
+ ODR_MEM r = o->mem;
+
+ o->mem = 0;
+ return r;
+}
+
void *odr_malloc(ODR o, int size)
{
struct odr_memblock *p = o->mem;
void *odr_malloc(ODR o, int size)
{
struct odr_memblock *p = o->mem;
@@
-86,16
+110,14
@@
void *odr_malloc(ODR o, int size)
if (!p || p->size - p->top < size)
if (!(p = get_block(size)))
if (!p || p->size - p->top < size)
if (!(p = get_block(size)))
- {
- o->error = OMEMORY;
- return 0;
- }
+ abort();
else
{
p->next = o->mem;
o->mem = p;
}
r = p->buf + p->top;
else
{
p->next = o->mem;
o->mem = p;
}
r = p->buf + p->top;
+ /* align size */
p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
return r;
}
p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
return r;
}