X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=d5b0ce5401f150726eca4928c04e3deb9dd28000;hb=205c2223beca67a0dc7bf14df988b2c05faf1293;hp=d007f1b0d9221189a1fe506b2d0484e6fccf0cfb;hpb=72592d242326dea9e05cae90d50348a2da0c0948;p=yaz-moved-to-github.git

diff --git a/odr/odr.c b/odr/odr.c
index d007f1b..d5b0ce5 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,29 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.15  1995-08-15 12:00:22  quinn
+ * Revision 1.22  1996-10-08 12:58:17  adam
+ * New ODR function, odr_choice_enable_bias, to control behaviour of
+ * odr_choice_bias.
+ *
+ * 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
+ * More Windows work
+ *
+ * Revision 1.16  1995/09/27  15:02:57  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.15  1995/08/15  12:00:22  quinn
  * Updated External
  *
  * Revision 1.14  1995/06/19  12:38:46  quinn
@@ -56,7 +78,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 */
@@ -73,9 +95,15 @@ 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)
+{
+    return odr_errlist[n];
+}
+
 void odr_perror(ODR o, char *message)
 {
     fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]);
@@ -95,8 +123,8 @@ ODR odr_createmem(int direction)
 {
     struct odr *r;
 
-    if (!(r = malloc(sizeof(*r))))
-    	return 0;
+    if (!(r = xmalloc(sizeof(*r))))
+        return 0;
     r->direction = direction;
     r->print = stderr;
     r->buf = 0;
@@ -104,7 +132,8 @@ 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();
+    r->enable_bias = 1;
     odr_reset(r);
     return r;
 }
@@ -120,19 +149,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);
+        fclose(o->print);
+   xfree(o);
 }
 
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)
@@ -150,6 +179,6 @@ char *odr_getbuf(ODR o, int *len, int *size)
 {
     *len = o->ecb.top;
     if (size)
-    	*size = o->ecb.size;
+        *size = o->ecb.size;
     return (char*) o->ecb.buf;
 }