X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fodr.h;h=895d635b453fcd89c2592a5d2fb334a2de0908ec;hb=e0dc2b9e3d7bd7c91c6c6bb2fa650873a7ebfe72;hp=5b1019a425495a7f3ab0040a03257054347fa654;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git diff --git a/include/yaz/odr.h b/include/yaz/odr.h index 5b1019a..895d635 100644 --- a/include/yaz/odr.h +++ b/include/yaz/odr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2002, 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, @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: odr.h,v 1.1 1999-11-30 13:47:11 adam Exp $ + * $Id: odr.h,v 1.6 2002-07-25 12:51:08 adam Exp $ */ #ifndef ODR_H @@ -35,9 +35,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif +YAZ_BEGIN_CDECL #ifndef bool_t #define bool_t int @@ -123,33 +121,20 @@ typedef struct odr_constack #define ODR_S_CUR 1 #define ODR_S_END 2 -typedef struct odr_ecblock -{ - int can_grow; /* are we allowed to reallocate */ - unsigned char *buf; /* memory handle */ - int pos; /* current position */ - int top; /* top of buffer */ - 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) */ - const unsigned char *buf; /* for encoding or decoding */ - int buflen; /* size of buffer for encoding, len for decoding */ - const unsigned char *bp; /* position in buffer */ - int left; /* bytes remaining in buffer */ - odr_ecblock ecb; /* memory control block */ + int can_grow; /* are we allowed to reallocate */ + unsigned char *buf; /* memory handle */ + int size; /* current buffer size */ + + int pos; /* current position */ + int top; /* top of buffer (max pos when decoding) */ + + const unsigned char *bp; /* position in buffer (decoding) */ int t_class; /* implicit tagging (-1==default tag) */ int t_tag; @@ -163,12 +148,7 @@ typedef struct odr 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; + struct Odr_private *op; } *ODR; typedef int (*Odr_fun)(ODR, char **, int, const char *); @@ -211,6 +191,7 @@ 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 char *odr_strdup(ODR o, const char *str); +YAZ_EXPORT int *odr_intdup(ODR o, int v); YAZ_EXPORT NMEM odr_extract_mem(ODR o); YAZ_EXPORT Odr_null *odr_nullval(void); #define odr_release_mem(m) nmem_destroy(m) @@ -246,44 +227,8 @@ YAZ_EXPORT Odr_null *odr_nullval(void); #define ODR_MASK_GET(mask, num) ( ((num) >> 3 <= (mask)->top) ? \ ((mask)->bits[(num) >> 3] & (0X80 >> ((num) & 0X07)) ? 1 : 0) : 0) -/* Private macro. - * write a single character at the current position - grow buffer if - * necessary. - * (no, we're not usually this anal about our macros, but this baby is - * next to unreadable without some indentation :) - */ -#define odr_putc(o, c) \ -( \ - ( \ - (o)->ecb.pos < (o)->ecb.size ? \ - ( \ - (o)->ecb.buf[(o)->ecb.pos++] = (c), \ - 0 \ - ) : \ - ( \ - odr_grow_block(&(o)->ecb, 1) == 0 ? \ - ( \ - (o)->ecb.buf[(o)->ecb.pos++] = (c), \ - 0 \ - ) : \ - ( \ - (o)->error = OSPACE, \ - -1 \ - ) \ - ) \ - ) == 0 ? \ - ( \ - (o)->ecb.pos > (o)->ecb.top ? \ - ( \ - (o)->ecb.top = (o)->ecb.pos, \ - 0 \ - ) : \ - 0 \ - ) : \ - -1 \ -) \ - -#define odr_tell(o) ((o)->ecb.pos) + +#define odr_tell(o) ((o)->pos) #define odr_offset(o) ((o)->bp - (o)->buf) #define odr_ok(o) (!(o)->error) #define odr_getmem(o) ((o)->mem) @@ -327,6 +272,7 @@ YAZ_EXPORT int odr_oid(ODR o, Odr_oid **p, int opt, const char *name); YAZ_EXPORT int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp, const char *name); YAZ_EXPORT int odr_cstring(ODR o, char **p, int opt, const char *name); +YAZ_EXPORT int odr_iconv_string(ODR o, char **p, int opt, const char *name); YAZ_EXPORT int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num, const char *name); YAZ_EXPORT int odr_set_of(ODR o, Odr_fun type, void *p, int *num, @@ -338,7 +284,7 @@ YAZ_EXPORT void odr_begin(ODR o); YAZ_EXPORT void odr_end(ODR o); YAZ_EXPORT Odr_oid *odr_oiddup(ODR odr, Odr_oid *o); YAZ_EXPORT Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o); -YAZ_EXPORT int odr_grow_block(odr_ecblock *b, int min_bytes); +YAZ_EXPORT int odr_grow_block(ODR b, int min_bytes); YAZ_EXPORT int odr_write(ODR o, unsigned char *buf, int bytes); YAZ_EXPORT int odr_seek(ODR o, int whence, int offset); YAZ_EXPORT int odr_dumpBER(FILE *f, const char *buf, int len); @@ -346,8 +292,9 @@ YAZ_EXPORT void odr_choice_bias(ODR o, int what); YAZ_EXPORT void odr_choice_enable_bias(ODR o, int mode); YAZ_EXPORT int odr_total(ODR o); YAZ_EXPORT char *odr_errmsg(int n); -YAZ_EXPORT Odr_oid *odr_getoidbystr(ODR o, char *str); -YAZ_EXPORT Odr_oid *odr_getoidbystr_nmem(NMEM o, char *str); +YAZ_EXPORT Odr_oid *odr_getoidbystr(ODR o, const char *str); +YAZ_EXPORT Odr_oid *odr_getoidbystr_nmem(NMEM o, const char *str); + YAZ_EXPORT int odr_initmember(ODR o, void *p, int size); YAZ_EXPORT int odr_peektag(ODR o, int *zclass, int *tag, int *cons); YAZ_EXPORT void odr_setlenlen(ODR o, int len); @@ -377,9 +324,10 @@ YAZ_EXPORT int odr_graphicstring(ODR o, char **p, int opt, const char *name); YAZ_EXPORT int odr_generalizedtime(ODR o, char **p, int opt, const char *name); -#ifdef __cplusplus -} -#endif + +YAZ_EXPORT int odr_set_charset(ODR o, const char *to, const char *from); + +YAZ_END_CDECL #include