X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fodr.h;h=9d746fcf87db52c0ffb81b00e7605b986a73652f;hb=471c6dccdbb5c5a9c08b24c9abd6a1dcda29e79e;hp=40a458f2b7b136582cd3b701f0cc55e264572f8f;hpb=39fc6d5c771c134df959cdd44b2ad62d07b9576f;p=yaz-moved-to-github.git diff --git a/include/yaz/odr.h b/include/yaz/odr.h index 40a458f..9d746fc 100644 --- a/include/yaz/odr.h +++ b/include/yaz/odr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2003, Index Data. + * Copyright (C) 1995-2005, Index Data ApS * * 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,12 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: odr.h,v 1.12 2003-05-24 19:20:14 adam Exp $ + * $Id: odr.h,v 1.22 2006-02-19 18:33:08 adam Exp $ + */ + +/** + * \file odr.h + * \brief Header for ODR (Open Data Representation) */ #ifndef ODR_H @@ -106,17 +111,6 @@ typedef struct odr_bitmask typedef int Odr_oid; /* terminate by -1 */ -typedef struct odr_constack -{ - const unsigned char *base; /* starting point of data */ - int base_offset; - int len; /* length of data, if known, else -1 - (decoding only) */ - const unsigned char *lenb; /* where to encode length */ - int len_offset; - int lenlen; /* length of length-field */ -} odr_constack; - #define ODR_S_SET 0 #define ODR_S_CUR 1 #define ODR_S_END 2 @@ -129,10 +123,10 @@ typedef struct odr int can_grow; /* are we allowed to reallocate */ unsigned char *buf; /* memory handle */ - int size; /* current buffer size */ + int size; /* current buffer size (encoding+decoding) */ - int pos; /* current position */ - int top; /* top of buffer (max pos when decoding) */ + int pos; /* current position (encoding) */ + int top; /* top of buffer (max pos when encoding) */ const unsigned char *bp; /* position in buffer (decoding) */ @@ -143,7 +137,7 @@ typedef struct odr int choice_bias; /* force choice */ int lenlen; /* force length-of-lenght (odr_setlen()) */ - FILE *print; /* output file for direction print */ + FILE *print; /* output file handler for direction print */ int indent; /* current indent level for printing */ NMEM mem; /* memory handle for decoding (primarily) */ @@ -186,8 +180,8 @@ 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_setelement(ODR o, const char *addinfo); -YAZ_EXPORT char *odr_getelement(ODR o); -YAZ_EXPORT void odr_perror(ODR o, char *message); +YAZ_EXPORT const char *odr_getelement(ODR o); +YAZ_EXPORT void odr_perror(ODR o, const 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); @@ -198,6 +192,8 @@ 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 Odr_oct *odr_create_Odr_oct(ODR o, const unsigned char *buf, + int sz); YAZ_EXPORT NMEM odr_extract_mem(ODR o); YAZ_EXPORT Odr_null *odr_nullval(void); #define odr_release_mem(m) nmem_destroy(m) @@ -236,10 +232,10 @@ YAZ_EXPORT Odr_null *odr_nullval(void); YAZ_EXPORT int ber_boolean(ODR o, int *val); YAZ_EXPORT int ber_tag(ODR o, void *p, int zclass, int tag, - int *constructed, int opt, const char *name); + int *constructed, int opt, const char *name); 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 max); + 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); @@ -251,7 +247,7 @@ YAZ_EXPORT int ber_null(ODR o); YAZ_EXPORT int odr_null(ODR o, Odr_null **p, int opt, const char *name); YAZ_EXPORT int ber_integer(ODR o, int *val); YAZ_EXPORT int odr_constructed_begin(ODR o, void *p, int zclass, int tag, - const char *name); + const char *name); YAZ_EXPORT int odr_constructed_end(ODR o); YAZ_EXPORT int odr_sequence_begin(ODR o, void *p, int size, const char *name); YAZ_EXPORT int odr_set_begin(ODR o, void *p, int size, const char *name); @@ -262,19 +258,19 @@ YAZ_EXPORT int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name); YAZ_EXPORT int odp_more_chunks(ODR o, const unsigned char *base, int len); YAZ_EXPORT int odr_constructed_more(ODR o); YAZ_EXPORT int odr_bitstring(ODR o, Odr_bitmask **p, int opt, - const char *name); + const char *name); YAZ_EXPORT int ber_bitstring(ODR o, Odr_bitmask *p, int cons); YAZ_EXPORT int odr_generalstring(ODR o, char **p, int opt, const char *name); -YAZ_EXPORT int ber_oidc(ODR o, Odr_oid *p); +YAZ_EXPORT int ber_oidc(ODR o, Odr_oid *p, int max_oid_size); 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); + 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); + const char *name); YAZ_EXPORT int odr_set_of(ODR o, Odr_fun type, void *p, int *num, - const char *name); + const char *name); YAZ_EXPORT int odr_any(ODR o, Odr_any **p, int opt, const char *name); YAZ_EXPORT int ber_any(ODR o, Odr_any **p); YAZ_EXPORT int completeBER(const unsigned char *buf, int len); @@ -297,6 +293,7 @@ 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); YAZ_EXPORT int odr_missing(ODR o, int opt, const char *name); +YAZ_EXPORT char *odr_prepend(ODR o, const char *prefix, const char *old); typedef struct Odr_external { @@ -309,25 +306,45 @@ typedef struct Odr_external #define ODR_EXTERNAL_arbitrary 2 union { - Odr_any *single_ASN1_type; - Odr_oct *octet_aligned; - Odr_bitmask *arbitrary; /* we aren't really equipped for this*/ + Odr_any *single_ASN1_type; + Odr_oct *octet_aligned; + Odr_bitmask *arbitrary; /* we aren't really equipped for this*/ } u; } Odr_external; YAZ_EXPORT int odr_external(ODR o, Odr_external **p, int opt, - const char *name); + const char *name); YAZ_EXPORT int odr_visiblestring(ODR o, char **p, int opt, - const char *name); + const char *name); YAZ_EXPORT int odr_graphicstring(ODR o, char **p, int opt, - const char *name); + const char *name); YAZ_EXPORT int odr_generalizedtime(ODR o, char **p, int opt, - const char *name); + const char *name); YAZ_EXPORT int odr_set_charset(ODR o, const char *to, const char *from); +YAZ_EXPORT void odr_set_stream(ODR o, void *handle, + void (*stream_write)(ODR o, + void *handle, + int type, + const char *buf, + int len), + void (*stream_close)(void *handle)); + +YAZ_EXPORT void odr_printf(ODR o, const char *fmt, ...); + +YAZ_EXPORT const char **odr_get_element_path(ODR o); + YAZ_END_CDECL #include #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +