-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * 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:
* (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.25 2007-01-03 08:42:14 adam Exp $ */
/**
* \file odr.h
#include <yaz/yconfig.h>
#include <yaz/nmem.h>
+/* for definition of Odr_oid */
+#include <yaz/oid_util.h>
+
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
typedef struct odr_oct
{
- unsigned char *buf;
+ char *buf;
int len;
- int size;
} Odr_oct;
typedef void Odr_null;
typedef struct odr_bitmask
{
#define ODR_BITMASK_SIZE 256
- unsigned char bits[ODR_BITMASK_SIZE];
+ char bits[ODR_BITMASK_SIZE];
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 can_grow; /* are we allowed to reallocate */
- unsigned char *buf; /* memory handle */
- 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 */
+ int error; /* current error state (0==OK) */
NMEM mem; /* memory handle for decoding (primarily) */
struct Odr_private *op;
-} *ODR;
+};
typedef int (*Odr_fun)(ODR, char **, int, const char *);
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);
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 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 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 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)
#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)))
((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)
-#define odr_setmem(o, v) ((o)->mem = (v))
#define ODR_MAXNAME 256
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);
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);
\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, 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_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);
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
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;
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,
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 <yaz/xmalloc.h>
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff