X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fodr.h;h=20ee8c5c58c07f7613e0936938f85b6b1357cb70;hp=abdeabd0d728c34932a531d3eea24b0df93c4742;hb=b3be6bf5b31785568d39c3c1d631759df84d90ca;hpb=372a500da226336c7bb4036e980be2587ad5fdeb

diff --git a/include/odr.h b/include/odr.h
index abdeabd..20ee8c5 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -1,11 +1,39 @@
-
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.1  1995-03-30 09:39:41  quinn
+ * Revision 1.4  1995-05-16 08:50:33  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.3  1995/05/15  11:55:54  quinn
+ * Work on asynchronous activity.
+ *
+ * Revision 1.2  1995/04/18  08:14:37  quinn
+ * Added dynamic memory allocation on encoding
+ *
+ * Revision 1.1  1995/03/30  09:39:41  quinn
  * Moved .h files to include directory
  *
  * Revision 1.15  1995/03/29  15:39:57  quinn
@@ -130,13 +158,30 @@ typedef int Odr_oid;   /* terminate by -1 */
 typedef struct odr_constack
 {
     unsigned char *base;         /* starting point of data */
+    int base_offset;
     int len;                     /* length of data, if known, else -1
 					(decoding only) */
     unsigned char *lenb;         /* where to encode length */
+    int len_offset;
     int lenlen;                  /* length of length-field */
 } odr_constack;
 
 struct odr_memblock; /* defined in odr_mem.c */
+typedef struct odr_memblock *ODR_MEM;
+
+#define ODR_S_SET     0
+#define ODR_S_CUR     1
+#define ODR_S_END     2
+
+typedef struct odr_ecblock
+{
+    int can_grow;         /* are we allowed to reallocate */
+    unsigned char *buf;            /* memory handle */
+    int pos;              /* current position */
+    int top;              /* top of buffer */
+    int size;             /* current buffer size */
+} odr_ecblock;
+
 
 typedef struct odr
 {
@@ -148,6 +193,8 @@ typedef struct odr
     unsigned char *bp;   /* position in buffer */
     int left;            /* bytes remaining in buffer */
 
+    odr_ecblock ecb;     /* memory control block */
+
     int t_class;         /* implicit tagging (-1==default tag) */
     int t_tag;
 
@@ -195,9 +242,11 @@ void odr_setprint(ODR o, FILE *file);
 ODR odr_createmem(int direction);
 void odr_reset(ODR o);
 void odr_destroy(ODR o);
-void odr_setbuf(ODR o, char *buf, int len);
-char *odr_getbuf(ODR o, int *len);
+void odr_setbuf(ODR o, char *buf, int len, int can_grow);
+char *odr_getbuf(ODR o, int *len, int *size);
 void *odr_malloc(ODR o, int size);
+ODR_MEM odr_extract_mem(ODR o);
+void odr_release_mem(ODR_MEM p);
 
 #define odr_implicit(o, t, p, cl, tg, opt)\
 	(odr_implicit_settag((o), cl, tg), t ((o), (p), opt) )
@@ -221,6 +270,48 @@ void *odr_malloc(ODR o, int size);
 #define ODR_MASK_GET(mask, num)  ( ((num) >> 3 <= (mask)->top) ? \
     ((mask)->bits[(num) >> 3] & (0X80 >> ((num) & 0X07)) ? 1 : 0) : 0)
 
+/*
+ * write a single character at the current position - grow buffer if
+ * necessary.
+ * (no, we're not usually this anal about our macros, but this baby is
+ *  next to unreadable without some indentation  :)
+ */
+#define odr_putc(o, c) \
+( \
+    ( \
+    	(o)->ecb.pos < (o)->ecb.size ? \
+	( \
+	    (o)->ecb.buf[(o)->ecb.pos++] = (c), \
+	    0 \
+	) : \
+	( \
+	    odr_grow_block(&(o)->ecb, 1) == 0 ? \
+	    ( \
+	    	(o)->ecb.buf[(o)->ecb.pos++] = (c), \
+		0 \
+	    ) : \
+	    ( \
+	    	(o)->error = OSPACE, \
+		-1 \
+	    ) \
+	) \
+    ) == 0 ? \
+    ( \
+    	(o)->ecb.pos > (o)->ecb.top ? \
+	( \
+	    (o)->ecb.top = (o)->ecb.pos, \
+	    0 \
+	) : \
+	0 \
+    ) : \
+    	-1 \
+) \
+
+#define odr_tell(o) ((o)->ecb.pos)
+#define odr_ok(o) (!(o)->error)
+
+#define ODR_MAXNAME 256
+
 #include <prt.h>
 #include <dmalloc.h>