X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fodr.h;h=7f9308ff2d6ec859bd863edb124277d162923485;hp=d687d14081b66d153d9e9cc188d1a663fd7d9985;hb=ce627148dbba2878565b8d9da33f6b25f33da4bd;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c diff --git a/include/yaz/odr.h b/include/yaz/odr.h index d687d14..7f9308f 100644 --- a/include/yaz/odr.h +++ b/include/yaz/odr.h @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data. + * Copyright (C) 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: @@ -44,6 +44,10 @@ 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 @@ -94,9 +98,8 @@ YAZ_BEGIN_CDECL typedef struct odr_oct { - unsigned char *buf; + char *buf; int len; - int size; } Odr_oct; typedef void Odr_null; @@ -107,7 +110,7 @@ typedef Odr_oct Odr_any; typedef struct odr_bitmask { #define ODR_BITMASK_SIZE 256 - unsigned char bits[ODR_BITMASK_SIZE]; + char bits[ODR_BITMASK_SIZE]; int top; } Odr_bitmask; @@ -124,14 +127,6 @@ struct odr int error; /* current error state (0==OK) */ - 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) */ - - const unsigned char *bp; /* position in buffer (decoding) */ - NMEM mem; /* memory handle for decoding (primarily) */ struct Odr_private *op; @@ -168,6 +163,7 @@ typedef struct odr_arm extern char *odr_errlist[]; +YAZ_EXPORT int odr_offset(ODR o); 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); @@ -175,18 +171,19 @@ YAZ_EXPORT void odr_setelement(ODR o, const char *addinfo); 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 void odr_setprint_noclose(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 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 char *odr_strdup_null(ODR o, const char *str); -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 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 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) @@ -206,7 +203,7 @@ YAZ_EXPORT Odr_null *odr_nullval(void); #define ODR_MASK_SET(mask, num)\ (((mask)->bits[(num) >> 3] |= 0X80 >> ((num) & 0X07)),\ - (mask)->top < (num) >> 3 ? ((mask)->top = (num) >> 3) : 0) + (void) ((mask)->top < (num) >> 3 ? ((mask)->top = (num) >> 3) : 0)) #define ODR_MASK_CLEAR(mask, num)\ ((mask)->bits[(num) >> 3] &= ~(0X80 >> ((num) & 0X07))) @@ -215,8 +212,6 @@ YAZ_EXPORT Odr_null *odr_nullval(void); ((mask)->bits[(num) >> 3] & (0X80 >> ((num) & 0X07)) ? 1 : 0) : 0) -#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) @@ -226,18 +221,18 @@ 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); YAZ_EXPORT int ber_enctag(ODR o, int zclass, int tag, int constructed); -YAZ_EXPORT int ber_dectag(const unsigned char *buf, int *zclass, +YAZ_EXPORT int ber_dectag(const 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 int ber_declen(const 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); @@ -247,7 +242,7 @@ YAZ_EXPORT int odr_sequence_end(ODR o); YAZ_EXPORT int odr_set_end(ODR o); YAZ_EXPORT int ber_octetstring(ODR o, Odr_oct *p, int cons); 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 odp_more_chunks(ODR o, const 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); @@ -272,19 +267,19 @@ YAZ_EXPORT int ber_any(ODR o, Odr_any **p); \retval 0 package is incomplete \retval >0 package is complete and length is return value */ -YAZ_EXPORT int completeBER(const unsigned char *buf, int len); +YAZ_EXPORT int completeBER(const 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, 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_write(ODR o, const 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); @@ -298,7 +293,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 @@ -307,7 +302,7 @@ typedef struct Odr_external union { Odr_any *single_ASN1_type; - Odr_oct *octet_aligned; + Odr_oct *octet_aligned; Odr_bitmask *arbitrary; /* we aren't really equipped for this*/ } u; } Odr_external; @@ -324,7 +319,7 @@ YAZ_EXPORT int odr_generalizedtime(ODR o, char **p, int opt, 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 (*stream_write)(ODR o, void *handle, int type, const char *buf, @@ -335,6 +330,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