X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fodr.h;h=2e1565921eabc78d81bfcaffe13e0981afa1c3a0;hb=546c28ba38f70ca66b6ce522df97645d9d5cefb9;hp=8bfc445e1488bebb9673171329617bdfebc51c12;hpb=cd5d6beb85878bfc65a2ebd2b771b86a1872af40;p=yaz-moved-to-github.git diff --git a/include/odr.h b/include/odr.h index 8bfc445..2e15659 100644 --- a/include/odr.h +++ b/include/odr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1999, 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, @@ -24,7 +24,46 @@ * OF THIS SOFTWARE. * * $Log: odr.h,v $ - * Revision 1.15 1995-10-18 16:12:36 quinn + * Revision 1.27 1999-01-08 11:23:17 adam + * Added const modifier to some of the BER/ODR encoding routines. + * + * Revision 1.26 1998/03/20 17:29:20 adam + * Include of odr_use.h in odr.h. Added prototype for odr_enum. + * + * Revision 1.25 1998/02/11 11:53:33 adam + * Changed code so that it compiles as C++. + * + * Revision 1.24 1997/11/24 11:33:56 adam + * Using function odr_nullval() instead of global ODR_NULLVAL when + * appropriate. + * + * Revision 1.23 1997/09/01 08:49:49 adam + * New windows NT/95 port using MSV5.0. To export DLL functions the + * YAZ_EXPORT modifier was added. Defined in yconfig.h. + * + * 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 * Better diagnostics. * * Revision 1.14 1995/09/29 17:12:04 quinn @@ -123,8 +162,13 @@ #include #include +#include #include +#ifdef __cplusplus +extern "C" { +#endif + #ifndef bool_t #define bool_t int #endif @@ -196,18 +240,15 @@ typedef int Odr_oid; /* terminate by -1 */ typedef struct odr_constack { - unsigned char *base; /* starting point of data */ + const unsigned char *base; /* starting point of data */ int base_offset; int len; /* length of data, if known, else -1 (decoding only) */ - unsigned char *lenb; /* where to encode length */ + const unsigned char *lenb; /* where to encode length */ int len_offset; 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 @@ -221,15 +262,21 @@ typedef struct odr_ecblock int size; /* current buffer size */ } odr_ecblock; +typedef struct { /* used to be statics in ber_tag... */ + int lclass; + int ltag; + int br; + int lcons; +} Odr_ber_tag; typedef struct odr { int direction; /* the direction of this stream */ int error; /* current error state (0==OK) */ - unsigned char *buf; /* for encoding or decoding */ + const unsigned char *buf; /* for encoding or decoding */ int buflen; /* size of buffer for encoding, len for decoding */ - unsigned char *bp; /* position in buffer */ + const unsigned char *bp; /* position in buffer */ int left; /* bytes remaining in buffer */ odr_ecblock ecb; /* memory control block */ @@ -237,25 +284,29 @@ 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 int stackp; /* top of stack (-1 == initial state) */ odr_constack stack[ODR_MAX_STACK]; + + Odr_ber_tag odr_ber_tag; } *ODR; -typedef int (*Odr_fun)(); +typedef int (*Odr_fun)(ODR, char **, int); typedef struct odr_arm { int tagmode; - int class; + int zclass; int tag; int which; Odr_fun fun; @@ -275,20 +326,23 @@ typedef struct odr_arm #define ODATA 8 #define OSTACK 9 #define OCONLEN 10 +#define OLENOV 11 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); +YAZ_EXPORT int odr_geterror(ODR o); +YAZ_EXPORT void odr_perror(ODR o, char *message); +YAZ_EXPORT void odr_setprint(ODR o, FILE *file); +YAZ_EXPORT ODR odr_createmem(int direction); +YAZ_EXPORT void odr_reset(ODR o); +YAZ_EXPORT void odr_destroy(ODR o); +YAZ_EXPORT void odr_setbuf(ODR o, char *buf, int len, int can_grow); +YAZ_EXPORT char *odr_getbuf(ODR o, int *len, int *size); +YAZ_EXPORT void *odr_malloc(ODR o, int size); +YAZ_EXPORT NMEM odr_extract_mem(ODR o); +YAZ_EXPORT Odr_null *odr_nullval(void); +#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 +406,17 @@ 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 +#ifdef __cplusplus +} +#endif + +#include #include -#include +#include #endif