X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fodr.h;h=69cebfe45512a8111dd41106d448ff18d2d98dbd;hp=8bfc445e1488bebb9673171329617bdfebc51c12;hb=0a159e0b47088801788dc3a90b79f6d5e964ea1f;hpb=cd5d6beb85878bfc65a2ebd2b771b86a1872af40

diff --git a/include/odr.h b/include/odr.h
index 8bfc445..69cebfe 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,20 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.15  1995-10-18 16:12:36  quinn
+ * Revision 1.19  1996-10-08 12:58:08  adam
+ * New ODR function, odr_choice_enable_bias, to control behaviour of
+ * odr_choice_bias.
+ *
+ * Revision 1.18  1996/07/26  13:38:14  quinn
+ * Various smaller things. Gathered header-files.
+ *
+ * Revision 1.17  1995/11/08  17:41:27  quinn
+ * Smallish.
+ *
+ * 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
@@ -123,6 +136,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <nmem.h>
 #include <yconfig.h>
 
 #ifndef bool_t
@@ -237,12 +251,14 @@ typedef struct odr
     int t_class;         /* implicit tagging (-1==default tag) */
     int t_tag;
 
+    int enable_bias;     /* force choice enable flag */
     int choice_bias;     /* force choice */
+    int lenlen;          /* force length-of-lenght (odr_setlen()) */
 
     FILE *print;         /* output file for direction print */
     int indent;          /* current indent level for printing */
 
-    struct odr_memblock *mem;
+    NMEM mem;            /* memory handle for decoding (primarily) */
 
     /* stack for constructed types */
 #define ODR_MAX_STACK 50
@@ -275,6 +291,7 @@ typedef struct odr_arm
 #define ODATA           8
 #define OSTACK          9
 #define OCONLEN        10
+#define OLENOV         11
 
 extern char *odr_errlist[];
 
@@ -287,8 +304,9 @@ 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);
+NMEM odr_extract_mem(ODR o);
+#define odr_release_mem(m) nmem_destroy(m)
+#define ODR_MEM NMEM
 
 #define odr_implicit(o, t, p, cl, tg, opt)\
         (odr_implicit_settag((o), cl, tg), t ((o), (p), opt) )
@@ -352,10 +370,12 @@ void odr_release_mem(ODR_MEM p);
 #define odr_tell(o) ((o)->ecb.pos)
 #define odr_offset(o) ((o)->bp - (o)->buf)
 #define odr_ok(o) (!(o)->error)
+#define odr_getmem(o) ((o)->mem)
+#define odr_setmem(o, v) ((o)->mem = (v))
 
 #define ODR_MAXNAME 256
 
 #include <prt.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 #endif