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
Added last_child field to the node.
[yaz-moved-to-github.git]
/
odr
/
odr.c
diff --git
a/odr/odr.c
b/odr/odr.c
index
cc94ef8
..
af2665d
100644
(file)
--- a/
odr/odr.c
+++ b/
odr/odr.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
- * Revision 1.18 1995-09-29 17:12:22 quinn
+ * Revision 1.20 1995-11-08 17:41:32 quinn
+ * Smallish.
+ *
+ * Revision 1.19 1995/11/01 13:54:41 quinn
+ * Minor adjustments
+ *
+ * Revision 1.18 1995/09/29 17:12:22 quinn
* Smallish
*
* Revision 1.17 1995/09/29 17:01:50 quinn
* Smallish
*
* Revision 1.17 1995/09/29 17:01:50 quinn
@@
-65,7
+71,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
#include <odr.h>
Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */
#include <odr.h>
Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */
@@
-109,7
+115,7
@@
ODR odr_createmem(int direction)
{
struct odr *r;
{
struct odr *r;
- if (!(r = malloc(sizeof(*r))))
+ if (!(r = xmalloc(sizeof(*r))))
return 0;
r->direction = direction;
r->print = stderr;
return 0;
r->direction = direction;
r->print = stderr;
@@
-118,7
+124,7
@@
ODR odr_createmem(int direction)
r->ecb.size = r->ecb.pos = r->ecb.top = 0;
r->ecb.can_grow = 1;
r->buflen = 0;
r->ecb.size = r->ecb.pos = r->ecb.top = 0;
r->ecb.can_grow = 1;
r->buflen = 0;
- r->mem = 0;
+ r->mem = nmem_create();
odr_reset(r);
return r;
}
odr_reset(r);
return r;
}
@@
-134,19
+140,18
@@
void odr_reset(ODR o)
o->t_tag = -1;
o->indent = 0;
o->stackp = -1;
o->t_tag = -1;
o->indent = 0;
o->stackp = -1;
- odr_release_mem(o->mem);
- o->mem = 0;
+ nmem_reset(o->mem);
o->choice_bias = -1;
}
void odr_destroy(ODR o)
{
o->choice_bias = -1;
}
void odr_destroy(ODR o)
{
- odr_release_mem(o->mem);
+ nmem_destroy(o->mem);
if (o->ecb.buf && o->ecb.can_grow)
if (o->ecb.buf && o->ecb.can_grow)
- free(o->ecb.buf);
+ xfree(o->ecb.buf);
if (o->print != stderr)
fclose(o->print);
if (o->print != stderr)
fclose(o->print);
- free(o);
+ xfree(o);
}
void odr_setbuf(ODR o, char *buf, int len, int can_grow)
}
void odr_setbuf(ODR o, char *buf, int len, int can_grow)