X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=301f15144604aa24fd3e388649e6f0aa70637e59;hb=52463063061a631f9cb086e938bc4494efec0bb5;hp=cc94ef82936cb9b5c94233db52463537f91797c0;hpb=63cafe41a93427118959a74201b3e331169a71d9;p=yaz-moved-to-github.git

diff --git a/odr/odr.c b/odr/odr.c
index cc94ef8..301f151 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.18  1995-09-29 17:12:22  quinn
+ * Revision 1.21  1996-07-26 13:38:19  quinn
+ * Various smaller things. Gathered header-files.
+ *
+ * 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
@@ -65,7 +74,7 @@
 #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 */
@@ -82,7 +91,8 @@ char *odr_errlist[] =
     "Protocol error",
     "Malformed data",
     "Stack overflow",
-    "Length of constructed type different from sum of members"
+    "Length of constructed type different from sum of members",
+    "Overflow writing definite length of constructed type"
 };
 
 char *odr_errmsg(int n)
@@ -109,7 +119,7 @@ ODR odr_createmem(int direction)
 {
     struct odr *r;
 
-    if (!(r = malloc(sizeof(*r))))
+    if (!(r = xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
     r->print = stderr;
@@ -118,7 +128,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->mem = 0;
+    r->mem = nmem_create();
     odr_reset(r);
     return r;
 }
@@ -134,19 +144,19 @@ void odr_reset(ODR o)
     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;
+    o->lenlen = 1;
 }
     
 void odr_destroy(ODR o)
 {
-    odr_release_mem(o->mem);
+    nmem_destroy(o->mem);
     if (o->ecb.buf && o->ecb.can_grow)
-        free(o->ecb.buf);
+       xfree(o->ecb.buf);
     if (o->print != stderr)
         fclose(o->print);
-    free(o);
+   xfree(o);
 }
 
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)