Modified Data1-system to use nmem

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

diff --git a/include/odr.h b/include/odr.h
index 55e0f08..e1b0c0c 100644 (file)
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,19 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.13  1995-09-29 17:01:49  quinn
+ * 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
+ * Smallish
+ *
+ * Revision 1.13  1995/09/29  17:01:49  quinn
  * More Windows work
  *
  * Revision 1.12  1995/09/27  15:02:48  quinn
@@ -117,6 +129,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <nmem.h>
 #include <yconfig.h>
 
 #ifndef bool_t
@@ -236,7 +249,7 @@ typedef struct odr
     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
@@ -244,7 +257,7 @@ typedef struct odr
     odr_constack stack[ODR_MAX_STACK];
 } *ODR;
 
-typedef int MDF (*Odr_fun)();
+typedef int (*Odr_fun)();
 
 typedef struct odr_arm
 {
@@ -272,17 +285,18 @@ typedef struct odr_arm
 
 extern char *odr_errlist[];
 
-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);
+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);
+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) )
@@ -344,11 +358,14 @@ void MDF 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