/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, 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,
* OF THIS SOFTWARE.
*
* $Log: odr.h,v $
- * Revision 1.16 1995-11-01 13:54:36 quinn
+ * Revision 1.22 1997-07-21 12:44:30 adam
+ * Moved definitions of nmem_block and nmem_control.
+ *
+ * Revision 1.21 1997/05/14 06:53:41 adam
+ * C++ support.
+ *
+ * Revision 1.20 1997/04/30 08:52:08 quinn
+ * Null
+ *
+ * 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
#include <stdio.h>
#include <string.h>
+#include <nmem.h>
#include <yconfig.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef bool_t
#define bool_t int
#endif
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
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
typedef struct odr_arm
{
int tagmode;
- int class;
+ int zclass;
int tag;
int which;
Odr_fun fun;
#define ODATA 8
#define OSTACK 9
#define OCONLEN 10
+#define OLENOV 11
extern char *odr_errlist[];
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) )
#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
+#ifdef __cplusplus
+}
+#endif
+
#include <prt.h>
#include <xmalloc.h>