-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: odr.c,v 1.13 2005-08-11 14:21:55 adam Exp $
- *
*/
/**
#include <yaz/xmalloc.h>
#include <yaz/log.h>
+#include <yaz/snprintf.h>
#include "odr-priv.h"
static int log_level=0;
const char *buf, int len),
void (*stream_close)(void *handle))
{
- o->print = (FILE*) handle;
+ o->op->print = (FILE*) handle;
o->op->stream_write = stream_write;
o->op->stream_close = stream_close;
}
if (!(o = (ODR)xmalloc(sizeof(*o))))
return 0;
+ o->op = (struct Odr_private *) xmalloc (sizeof(*o->op));
o->direction = direction;
o->buf = 0;
o->size = o->pos = o->top = 0;
- o->can_grow = 1;
+ o->op->can_grow = 1;
o->mem = nmem_create();
- o->enable_bias = 1;
- o->op = (struct Odr_private *) xmalloc (sizeof(*o->op));
+ o->op->enable_bias = 1;
o->op->odr_ber_tag.lclass = -1;
o->op->iconv_handle = 0;
odr_setprint(o, stderr);
o->bp = o->buf;
odr_seek(o, ODR_S_SET, 0);
o->top = 0;
- o->t_class = -1;
- o->t_tag = -1;
- o->indent = 0;
+ o->op->t_class = -1;
+ o->op->t_tag = -1;
+ o->op->indent = 0;
o->op->stack_first = 0;
o->op->stack_top = 0;
o->op->tmp_names_sz = 0;
o->op->tmp_names_buf = 0;
nmem_reset(o->mem);
- o->choice_bias = -1;
- o->lenlen = 1;
+ o->op->choice_bias = -1;
+ o->op->lenlen = 1;
if (o->op->iconv_handle != 0)
yaz_iconv(o->op->iconv_handle, 0, 0, 0, 0);
yaz_log (log_level, "odr_reset o=%p", o);
void odr_destroy(ODR o)
{
nmem_destroy(o->mem);
- if (o->buf && o->can_grow)
+ if (o->buf && o->op->can_grow)
xfree(o->buf);
if (o->op->stream_close)
- o->op->stream_close(o->print);
+ o->op->stream_close(o->op->print);
if (o->op->iconv_handle != 0)
yaz_iconv_close (o->op->iconv_handle);
xfree(o->op);
o->bp = (unsigned char *) buf;
o->buf = (unsigned char *) buf;
- o->can_grow = can_grow;
+ o->op->can_grow = can_grow;
o->top = o->pos = 0;
o->size = len;
}
char buf[4096];
va_start(ap, fmt);
-#ifdef WIN32
- _vsnprintf(buf, sizeof(buf)-1, fmt, ap);
-#else
-#if HAVE_VSNPRINTF
- vsnprintf(buf, sizeof(buf), fmt, ap);
-#else
- vsprintf(buf, fmt, ap);
-#endif
-#endif
- o->op->stream_write(o, o->print, ODR_VISIBLESTRING, buf, strlen(buf));
+ yaz_vsnprintf(buf, sizeof(buf), fmt, ap);
+ o->op->stream_write(o, o->op->print, ODR_VISIBLESTRING, buf, strlen(buf));
va_end(ap);
}
/*