projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SOIF syntax.
[yaz-moved-to-github.git]
/
include
/
odr.h
diff --git
a/include/odr.h
b/include/odr.h
index
f9d55d7
..
1546d68
100644
(file)
--- a/
include/odr.h
+++ b/
include/odr.h
@@
-24,7
+24,13
@@
* OF THIS SOFTWARE.
*
* $Log: odr.h,v $
* OF THIS SOFTWARE.
*
* $Log: odr.h,v $
- * Revision 1.16 1995-11-01 13:54:36 quinn
+ * 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
* Minor adjustments
*
* Revision 1.15 1995/10/18 16:12:36 quinn
@@
-126,6
+132,7
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
+#include <nmem.h>
#include <yconfig.h>
#ifndef bool_t
#include <yconfig.h>
#ifndef bool_t
@@
-241,11
+248,12
@@
typedef struct odr
int t_tag;
int choice_bias; /* force choice */
int t_tag;
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 */
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
/* stack for constructed types */
#define ODR_MAX_STACK 50
@@
-278,6
+286,7
@@
typedef struct odr_arm
#define ODATA 8
#define OSTACK 9
#define OCONLEN 10
#define ODATA 8
#define OSTACK 9
#define OCONLEN 10
+#define OLENOV 11
extern char *odr_errlist[];
extern char *odr_errlist[];
@@
-290,8
+299,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);
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_implicit(o, t, p, cl, tg, opt)\
(odr_implicit_settag((o), cl, tg), t ((o), (p), opt) )
@@
-355,6
+365,8
@@
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_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
#define ODR_MAXNAME 256