X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=5c21f2fcb07cba2cf6f514d563ac5377ae1f5522;hb=99268f722648e84bf5c54eb685a1434e100f38a1;hp=c5d725ce31bd6d2d23576c345f46f1bd906d4ef7;hpb=75b13633ae87b4e716c26d2d71a2342fa0be70c7;p=yaz-moved-to-github.git

diff --git a/odr/odr.c b/odr/odr.c
index c5d725c..5c21f2f 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,35 @@
 /*
- * 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.4  1995-03-07 13:16:13  quinn
+ * 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
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.9  1995/04/10  10:23:11  quinn
+ * Smallish changes.
+ *
+ * Revision 1.8  1995/03/17  10:17:43  quinn
+ * Added memory management.
+ *
+ * Revision 1.7  1995/03/10  11:44:41  quinn
+ * Fixed serious stack-bug in odr_cons_begin
+ *
+ * Revision 1.6  1995/03/08  12:12:15  quinn
+ * Added better error checking.
+ *
+ * Revision 1.5  1995/03/07  13:28:57  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.4  1995/03/07  13:16:13  quinn
  * Fixed bug in odr_reset
  *
  * Revision 1.3  1995/03/07  10:21:31  quinn
@@ -22,17 +47,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <dmalloc.h>
 #include <odr.h>
 
 char *odr_errlist[] =
 {
     "No (unknown) error",
-    "Memoy allocation failed",
+    "Memory allocation failed",
     "System error",
     "No space in buffer",
     "Required data element missing",
     "Unexpected tag",
-    "Other error"
+    "Other error",
+    "Protocol error",
+    "Malformed data",
+    "Stack overflow"
 };
 
 void odr_perror(ODR o, char *message)
@@ -57,9 +86,13 @@ ODR odr_createmem(int direction)
     if (!(r = malloc(sizeof(*r))))
     	return 0;
     r->direction = direction;
-    r->print = stdout;
+    r->print = stderr;
     r->buf = 0;
+    r->ecb.buf = 0;
+    r->ecb.size = r->ecb.pos = r->ecb.top = 0;
+    r->ecb.can_grow = 1;
     r->buflen = 0;
+    r->mem = 0;
     odr_reset(r);
     return r;
 }
@@ -68,26 +101,42 @@ void odr_reset(ODR o)
 {
     o->error = ONONE;
     o->bp = o->buf;
+    odr_seek(o, ODR_S_SET, 0);
+    o->ecb.top = 0;
     o->left = o->buflen;
     o->t_class = -1;
     o->t_tag = -1;
     o->indent = 0;
-    o->stackp = 0;
+    o->stackp = -1;
+    odr_release_mem(o->mem);
+    o->mem = 0;
 }
     
 void odr_destroy(ODR o)
 {
+    odr_release_mem(o->mem);
+    if (o->ecb.buf && o->ecb.can_grow)
+    	free(o->ecb.buf);
+    if (o->print != stderr)
+    	fclose(o->print);
     free(o);
 }
 
-void odr_setbuf(ODR o, char *buf, int len)
+void odr_setbuf(ODR o, char *buf, int len, int can_grow)
 {
     o->buf = o->bp = (unsigned char *) buf;
     o->buflen = o->left = len;
+
+    o->ecb.buf = (unsigned char *) buf;
+    o->ecb.can_grow = can_grow;
+    o->ecb.top = o->ecb.pos = 0;
+    o->ecb.size = len;
 }
 
-char *odr_getbuf(ODR o, int *len)
+char *odr_getbuf(ODR o, int *len, int *size)
 {
-    *len = o->bp - o->buf;
-    return (char *) o->buf;
-}    
+    *len = o->ecb.top;
+    if (size)
+    	*size = o->ecb.size;
+    return (char*) o->ecb.buf;
+}