X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fodr.h;h=bfd4d35a0aa3804a81d3a9aae509cc4a54e1ef44;hb=a834d92665e792c011e86d5603968ab31237575a;hp=ccff72edc73e8a9edbf481a1a5296545bcfaedf4;hpb=8d08fd5b79e49e14ca014de8e6bed12a2cc0468d;p=yaz-moved-to-github.git diff --git a/include/yaz/odr.h b/include/yaz/odr.h index ccff72e..bfd4d35 100644 --- a/include/yaz/odr.h +++ b/include/yaz/odr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2001, Index Data. + * Copyright (c) 1995-2003, 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.4 2001-03-25 21:55:12 adam Exp $ + * $Id: odr.h,v 1.10 2003-03-18 13:34:35 adam Exp $ */ #ifndef ODR_H @@ -121,13 +121,6 @@ typedef struct odr_constack #define ODR_S_CUR 1 #define ODR_S_END 2 -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 */ @@ -155,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 *); @@ -190,10 +178,13 @@ typedef struct odr_arm #define OSTACK 9 #define OCONLEN 10 #define OLENOV 11 +#define OHTTP 12 extern char *odr_errlist[]; YAZ_EXPORT int odr_geterror(ODR o); +YAZ_EXPORT int odr_geterrorx(ODR o, int *x); +YAZ_EXPORT void odr_seterror(ODR o, int errorno, int errorid); 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); @@ -203,6 +194,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 char *odr_strdupn(ODR o, const char *str, size_t n); YAZ_EXPORT int *odr_intdup(ODR o, int v); YAZ_EXPORT NMEM odr_extract_mem(ODR o); YAZ_EXPORT Odr_null *odr_nullval(void); @@ -239,42 +231,6 @@ 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)->pos < (o)->size ? \ - ( \ - (o)->buf[(o)->pos++] = (c), \ - 0 \ - ) : \ - ( \ - odr_grow_block((o), 1) == 0 ? \ - ( \ - (o)->buf[(o)->pos++] = (c), \ - 0 \ - ) : \ - ( \ - (o)->error = OSPACE, \ - -1 \ - ) \ - ) \ - ) == 0 ? \ - ( \ - (o)->pos > (o)->top ? \ - ( \ - (o)->top = (o)->pos, \ - 0 \ - ) : \ - 0 \ - ) : \ - -1 \ -) \ #define odr_tell(o) ((o)->pos) #define odr_offset(o) ((o)->bp - (o)->buf) @@ -289,13 +245,13 @@ YAZ_EXPORT int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt); YAZ_EXPORT int ber_enctag(ODR o, int zclass, int tag, int constructed); YAZ_EXPORT int ber_dectag(const unsigned char *buf, int *zclass, - int *tag, int *constructed); + int *tag, int *constructed, int max); YAZ_EXPORT int odr_bool(ODR o, int **p, int opt, const char *name); YAZ_EXPORT int odr_integer(ODR o, int **p, int opt, const char *name); YAZ_EXPORT int odr_enum(ODR o, int **p, int opt, const char *name); YAZ_EXPORT int odr_implicit_settag(ODR o, int zclass, int tag); YAZ_EXPORT int ber_enclen(ODR o, int len, int lenlen, int exact); -YAZ_EXPORT int ber_declen(const unsigned char *buf, int *len); +YAZ_EXPORT int ber_declen(const unsigned char *buf, int *len, int max); YAZ_EXPORT void odr_prname(ODR o, const char *name); YAZ_EXPORT int ber_null(ODR o); YAZ_EXPORT int odr_null(ODR o, Odr_null **p, int opt, const char *name); @@ -320,6 +276,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, @@ -339,8 +296,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); @@ -370,6 +328,9 @@ 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); + +YAZ_EXPORT int odr_set_charset(ODR o, const char *to, const char *from); + YAZ_END_CDECL #include