Modified function heads & prototypes.

[yaz-moved-to-github.git] / include / odr.h

diff --git a/include/odr.h b/include/odr.h
index 2f338eb..0a0976f 100644 (file)
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,28 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.5  1995-05-22 11:31:24  quinn
+ * 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
+ * ODR_NULLVAL --> void
+ *
+ * Revision 1.5  1995/05/22  11:31:24  quinn
  * Added PDUs
  *
  * Revision 1.4  1995/05/16  08:50:33  quinn
@@ -93,6 +114,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <yconfig.h>
+
 #ifndef bool_t
 #define bool_t int
 #endif
@@ -129,8 +152,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
@@ -146,7 +171,7 @@ typedef struct odr_oct
     int size;
 } Odr_oct;
 
-typedef char Odr_null;
+typedef void Odr_null;
 extern Odr_null *ODR_NULLVAL;
 
 typedef Odr_oct Odr_any;
@@ -158,7 +183,6 @@ typedef struct odr_bitmask
     int top;
 } Odr_bitmask;
 
-#define ODR_OID_SIZE 100
 typedef int Odr_oid;   /* terminate by -1 */
 
 typedef struct odr_constack
@@ -204,6 +228,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 */
 
@@ -239,20 +265,21 @@ typedef struct odr_arm
 #define OPROTO         7
 #define ODATA          8
 #define OSTACK          9
+#define OCONLEN        10
 
 extern char *odr_errlist[];
 
-int odr_geterror(ODR o);
-void odr_perror(ODR o, char *message);
-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, 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);
+int MDF odr_geterror(ODR o);
+void MDF odr_perror(ODR o, char *message);
+void MDF odr_setprint(ODR o, FILE *file);
+ODR MDF odr_createmem(int direction);
+void MDF odr_reset(ODR o);
+void MDF odr_destroy(ODR o);
+void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow);
+char MDF *odr_getbuf(ODR o, int *len, int *size);
+void MDF *odr_malloc(ODR o, int size);
+ODR_MEM MDF odr_extract_mem(ODR o);
+void MDF 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) )
@@ -276,7 +303,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