Fixed bug in elementsetname-handling in piggybacked presents.

[yaz-moved-to-github.git] / odr / odr.c

diff --git a/odr/odr.c b/odr/odr.c
index 5c21f2f..cc94ef8 100644 (file)
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.12  1995-05-16 08:50:49  quinn
+ * 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
+ * Added BER dumper.
+ *
+ * Revision 1.13  1995/05/22  11:32:02  quinn
+ * Fixing Interface to odr_null.
+ *
+ * Revision 1.12  1995/05/16  08:50:49  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.11  1995/05/15  11:56:08  quinn
@@ -50,6 +68,8 @@
 #include <dmalloc.h>
 #include <odr.h>
 
+Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
+
 char *odr_errlist[] =
 {
     "No (unknown) error",
@@ -61,9 +81,15 @@ char *odr_errlist[] =
     "Other error",
     "Protocol error",
     "Malformed data",
-    "Stack overflow"
+    "Stack overflow",
+    "Length of constructed type different from sum of members"
 };
 
+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]);
@@ -84,7 +110,7 @@ ODR odr_createmem(int direction)
     struct odr *r;
 
     if (!(r = malloc(sizeof(*r))))
-       return 0;
+        return 0;
     r->direction = direction;
     r->print = stderr;
     r->buf = 0;
@@ -110,15 +136,16 @@ void odr_reset(ODR o)
     o->stackp = -1;
     odr_release_mem(o->mem);
     o->mem = 0;
+    o->choice_bias = -1;
 }
     
 void odr_destroy(ODR o)
 {
     odr_release_mem(o->mem);
     if (o->ecb.buf && o->ecb.can_grow)
-       free(o->ecb.buf);
+        free(o->ecb.buf);
     if (o->print != stderr)
-       fclose(o->print);
+        fclose(o->print);
     free(o);
 }
 
@@ -137,6 +164,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;
 }