X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fodr.h;h=f9d55d74f6171422a9cf28ffef0b9a51ed302a5a;hb=b3b306f2e04d5ef2b918fcd377b74eaf1547de42;hp=065323ba0b4250465226abd8ed4a5e944c2edcfc;hpb=d4081206ab9bd0ed0c97c032d264ad1e1d4a051e;p=yaz-moved-to-github.git

diff --git a/include/odr.h b/include/odr.h
index 065323b..f9d55d7 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,34 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.7  1995-05-29 08:11:32  quinn
+ * Revision 1.16  1995-11-01 13:54:36  quinn
+ * Minor adjustments
+ *
+ * Revision 1.15  1995/10/18  16:12:36  quinn
+ * Better diagnostics.
+ *
+ * Revision 1.14  1995/09/29  17:12:04  quinn
+ * Smallish
+ *
+ * Revision 1.13  1995/09/29  17:01:49  quinn
+ * More Windows work
+ *
+ * Revision 1.12  1995/09/27  15:02:48  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.11  1995/08/15  12:00:09  quinn
+ * Updated External
+ *
+ * Revision 1.10  1995/08/10  08:54:33  quinn
+ * Added Explain.
+ *
+ * Revision 1.9  1995/06/19  12:38:26  quinn
+ * Reorganized include-files. Added small features.
+ *
+ * Revision 1.8  1995/06/16  13:16:04  quinn
+ * Fixed Defaultdiagformat.
+ *
+ * Revision 1.7  1995/05/29  08:11:32  quinn
  * Moved oid from odr/asn to util.
  *
  * Revision 1.6  1995/05/22  14:47:00  quinn
@@ -99,6 +126,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <yconfig.h>
+
 #ifndef bool_t
 #define bool_t int
 #endif
@@ -135,8 +164,10 @@
 #define ODR_SET         17
 #define ODR_NUMERICSTRING   18
 #define ODR_PRINTABLESTRING 19
+#define ODR_GENERALIZEDTIME 24
 #define ODR_GRAPHICSTRING   25
 #define ODR_VISIBLESTRING   26
+#define ODR_GENERALSTRING   27
 
 /*
  * odr stream directions
@@ -171,7 +202,7 @@ 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) */
+                                        (decoding only) */
     unsigned char *lenb;         /* where to encode length */
     int len_offset;
     int lenlen;                  /* length of length-field */
@@ -209,6 +240,8 @@ typedef struct odr
     int t_class;         /* implicit tagging (-1==default tag) */
     int t_tag;
 
+    int choice_bias;     /* force choice */
+
     FILE *print;         /* output file for direction print */
     int indent;          /* current indent level for printing */
 
@@ -234,16 +267,17 @@ typedef struct odr_arm
 /*
  * Error control.
  */
-#define ONONE		0
-#define OMEMORY		1
-#define OSYSERR		2
-#define OSPACE		3
-#define OREQUIRED	4
-#define OUNEXPECTED	5
-#define OOTHER		6
-#define OPROTO		7
-#define ODATA		8
+#define ONONE           0
+#define OMEMORY         1
+#define OSYSERR         2
+#define OSPACE          3
+#define OREQUIRED       4
+#define OUNEXPECTED     5
+#define OOTHER          6
+#define OPROTO          7
+#define ODATA           8
 #define OSTACK          9
+#define OCONLEN        10
 
 extern char *odr_errlist[];
 
@@ -260,12 +294,12 @@ 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) )
+        (odr_implicit_settag((o), cl, tg), t ((o), (p), opt) )
 
 #define odr_explicit(o, t, p, cl, tg, opt)\
-	((int) (odr_constructed_begin((o), (p), (cl), (tg)) ? \
-	t ((o), (p), (opt)) &&\
-	odr_constructed_end(o) : opt))
+        ((int) (odr_constructed_begin((o), (p), (cl), (tg)) ? \
+        t ((o), (p), (opt)) &&\
+        odr_constructed_end(o) : opt))
 
 #define ODR_MASK_ZERO(mask)\
     ((void) (memset((mask)->bits, 0, ODR_BITMASK_SIZE),\
@@ -281,7 +315,7 @@ void odr_release_mem(ODR_MEM p);
 #define ODR_MASK_GET(mask, num)  ( ((num) >> 3 <= (mask)->top) ? \
     ((mask)->bits[(num) >> 3] & (0X80 >> ((num) & 0X07)) ? 1 : 0) : 0)
 
-/*
+/* Private macro.
  * 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
@@ -290,40 +324,41 @@ void odr_release_mem(ODR_MEM p);
 #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 \
-	    ) \
-	) \
+        (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 \
+        (o)->ecb.pos > (o)->ecb.top ? \
+        ( \
+            (o)->ecb.top = (o)->ecb.pos, \
+            0 \
+        ) : \
+        0 \
     ) : \
-    	-1 \
+        -1 \
 ) \
 
 #define odr_tell(o) ((o)->ecb.pos)
+#define odr_offset(o) ((o)->bp - (o)->buf)
 #define odr_ok(o) (!(o)->error)
 
 #define ODR_MAXNAME 256
 
 #include <prt.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 #endif