X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fodr.h;h=eb12dd4ad27e2ee2485c6c91cf23018eae6f56a4;hp=d84405d0334b8f8fbdc0c21d14b4d53188768e60;hb=f2891d8771cb23cc70d973c6785bec20e31f511e;hpb=964580242e2e0b2e570f652afa58bfb90ad0bb5e diff --git a/include/yaz/odr.h b/include/yaz/odr.h index d84405d..eb12dd4 100644 --- a/include/yaz/odr.h +++ b/include/yaz/odr.h @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995-2006, Index Data +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data. * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -24,7 +24,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: odr.h,v 1.24 2006-10-09 21:02:41 adam Exp $ */ /** * \file odr.h @@ -40,8 +39,15 @@ #include #include +/* for definition of Odr_oid */ +#include + YAZ_BEGIN_CDECL +typedef nmem_int_t Odr_int; +typedef nmem_bool_t Odr_bool; +#define ODR_INT_PRINTF NMEM_INT_PRINTF + #ifndef bool_t #define bool_t int #endif @@ -109,41 +115,31 @@ typedef struct odr_bitmask int top; } Odr_bitmask; -typedef int Odr_oid; /* terminate by -1 */ - #define ODR_S_SET 0 #define ODR_S_CUR 1 #define ODR_S_END 2 -typedef struct odr +typedef struct odr *ODR; + +/** ODR handle and the public structs */ +struct odr { int direction; /* the direction of this stream */ - int error; /* current error state (0==OK) */ + int error; /* current error state (0==OK) */ - int can_grow; /* are we allowed to reallocate */ unsigned char *buf; /* memory handle */ + int top; /* top of buffer (max pos when encoding) */ int size; /* current buffer size (encoding+decoding) */ int pos; /* current position (encoding) */ - int top; /* top of buffer (max pos when encoding) */ const unsigned char *bp; /* position in buffer (decoding) */ - 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 handler for direction print */ - int indent; /* current indent level for printing */ - NMEM mem; /* memory handle for decoding (primarily) */ struct Odr_private *op; -} *ODR; +}; typedef int (*Odr_fun)(ODR, char **, int, const char *); @@ -188,10 +184,12 @@ 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 void *odr_malloc(ODR o, size_t 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 char *odr_strdup_null(ODR o, const char *str); +YAZ_EXPORT Odr_int *odr_intdup(ODR o, Odr_int v); +YAZ_EXPORT Odr_bool *odr_booldup(ODR o, Odr_bool 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); @@ -226,7 +224,6 @@ YAZ_EXPORT Odr_null *odr_nullval(void); #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 @@ -236,16 +233,16 @@ YAZ_EXPORT int ber_tag(ODR o, void *p, int zclass, int tag, 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); -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_bool(ODR o, Odr_bool **p, int opt, const char *name); +YAZ_EXPORT int odr_integer(ODR o, Odr_int **p, int opt, const char *name); +YAZ_EXPORT int odr_enum(ODR o, Odr_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, 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); -YAZ_EXPORT int ber_integer(ODR o, int *val); +YAZ_EXPORT int ber_integer(ODR o, Odr_int *val); YAZ_EXPORT int odr_constructed_begin(ODR o, void *p, int zclass, int tag, const char *name); YAZ_EXPORT int odr_constructed_end(ODR o); @@ -284,15 +281,15 @@ YAZ_EXPORT int completeBER(const unsigned char *buf, int len); 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 Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o); +YAZ_EXPORT Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o); 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); 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 size_t odr_total(ODR o); YAZ_EXPORT char *odr_errmsg(int n); YAZ_EXPORT Odr_oid *odr_getoidbystr(ODR o, const char *str); YAZ_EXPORT Odr_oid *odr_getoidbystr_nmem(NMEM o, const char *str); @@ -306,7 +303,7 @@ YAZ_EXPORT char *odr_prepend(ODR o, const char *prefix, const char *old); typedef struct Odr_external { Odr_oid *direct_reference; /* OPTIONAL */ - int *indirect_reference; /* OPTIONAL */ + Odr_int *indirect_reference; /* OPTIONAL */ char *descriptor; /* OPTIONAL */ int which; #define ODR_EXTERNAL_single 0 @@ -343,6 +340,10 @@ YAZ_EXPORT void odr_printf(ODR o, const char *fmt, ...); YAZ_EXPORT const char **odr_get_element_path(ODR o); +YAZ_EXPORT Odr_int odr_atoi(const char *s); + +YAZ_EXPORT Odr_int odr_strtol(const char *nptr, char **endptr, int base); + YAZ_END_CDECL #include @@ -351,6 +352,7 @@ YAZ_END_CDECL /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab