/*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2001, 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,
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
- * $Id: odr.h,v 1.1 1999-11-30 13:47:11 adam Exp $
+ * $Id: odr.h,v 1.5 2001-09-24 21:51:55 adam Exp $
*/
#ifndef ODR_H
#include <yaz/yconfig.h>
#include <yaz/nmem.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
#ifndef bool_t
#define bool_t int
#define ODR_S_CUR 1
#define ODR_S_END 2
-typedef struct odr_ecblock
-{
- int can_grow; /* are we allowed to reallocate */
- unsigned char *buf; /* memory handle */
- int pos; /* current position */
- int top; /* top of buffer */
- int size; /* current buffer size */
-} odr_ecblock;
-
typedef struct { /* used to be statics in ber_tag... */
int lclass;
int ltag;
int direction; /* the direction of this stream */
int error; /* current error state (0==OK) */
- const unsigned char *buf; /* for encoding or decoding */
- int buflen; /* size of buffer for encoding, len for decoding */
- const unsigned char *bp; /* position in buffer */
- int left; /* bytes remaining in buffer */
- odr_ecblock ecb; /* memory control block */
+ int can_grow; /* are we allowed to reallocate */
+ unsigned char *buf; /* memory handle */
+ int size; /* current buffer size */
+
+ int pos; /* current position */
+ int top; /* top of buffer (max pos when decoding) */
+
+ const unsigned char *bp; /* position in buffer (decoding) */
int t_class; /* implicit tagging (-1==default tag) */
int t_tag;
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 int *odr_intdup(ODR o, int v);
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_putc(o, c) \
( \
( \
- (o)->ecb.pos < (o)->ecb.size ? \
+ (o)->pos < (o)->size ? \
( \
- (o)->ecb.buf[(o)->ecb.pos++] = (c), \
+ (o)->buf[(o)->pos++] = (c), \
0 \
) : \
( \
- odr_grow_block(&(o)->ecb, 1) == 0 ? \
+ odr_grow_block((o), 1) == 0 ? \
( \
- (o)->ecb.buf[(o)->ecb.pos++] = (c), \
+ (o)->buf[(o)->pos++] = (c), \
0 \
) : \
( \
) \
) == 0 ? \
( \
- (o)->ecb.pos > (o)->ecb.top ? \
+ (o)->pos > (o)->top ? \
( \
- (o)->ecb.top = (o)->ecb.pos, \
+ (o)->top = (o)->pos, \
0 \
) : \
0 \
-1 \
) \
-#define odr_tell(o) ((o)->ecb.pos)
+#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)
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 int odr_grow_block(odr_ecblock *b, int min_bytes);
+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_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);
const char *name);
YAZ_EXPORT int odr_generalizedtime(ODR o, char **p, int opt,
const char *name);
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
#include <yaz/xmalloc.h>