X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=307283cb9e42ef88aea41584bb752280911a9537;hb=9c459af695605b44a044ad206562818be10034f1;hp=9b397b9b2606d60c1836906009a4f01393f737a3;hpb=84fdcc95fbd65091100b861671f410313e78eb0e;p=yaz-moved-to-github.git

diff --git a/odr/odr.c b/odr/odr.c
index 9b397b9..307283c 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,28 @@
 /*
- * 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.c,v $
- * Revision 1.11  1995-05-15 11:56:08  quinn
+ * 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
  * More work on memory management.
  *
  * Revision 1.10  1995/04/18  08:15:20  quinn
@@ -47,6 +65,8 @@
 #include <dmalloc.h>
 #include <odr.h>
 
+Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
+
 char *odr_errlist[] =
 {
     "No (unknown) error",
@@ -58,30 +78,36 @@ char *odr_errlist[] =
     "Other error",
     "Protocol error",
     "Malformed data",
-    "Stack overflow"
+    "Stack overflow",
+    "Length of constructed type different from sum of members"
 };
 
-void odr_perror(ODR o, char *message)
+char *odr_errmsg(int n)
+{
+    return odr_errlist[n];
+}
+
+void MDF odr_perror(ODR o, char *message)
 {
     fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]);
 }
 
-int odr_geterror(ODR o)
+int MDF odr_geterror(ODR o)
 {
     return o->error;
 }
 
-void odr_setprint(ODR o, FILE *file)
+void MDF odr_setprint(ODR o, FILE *file)
 {
     o->print = file;
 }
 
-ODR odr_createmem(int direction)
+ODR MDF 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;
@@ -94,7 +120,7 @@ ODR odr_createmem(int direction)
     return r;
 }
 
-void odr_reset(ODR o)
+void MDF odr_reset(ODR o)
 {
     o->error = ONONE;
     o->bp = o->buf;
@@ -107,19 +133,20 @@ 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)
+void MDF 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);
 }
 
-void odr_setbuf(ODR o, char *buf, int len, int can_grow)
+void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow)
 {
     o->buf = o->bp = (unsigned char *) buf;
     o->buflen = o->left = len;
@@ -130,10 +157,10 @@ void odr_setbuf(ODR o, char *buf, int len, int can_grow)
     o->ecb.size = len;
 }
 
-char *odr_getbuf(ODR o, int *len, int *size)
+char MDF *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;
 }