zoomtst3: print event name

[yaz-moved-to-github.git] / src / odr.c

diff --git a/src/odr.c b/src/odr.c
index 30b08c8..7e376c1 100644 (file)
--- a/src/odr.c
+++ b/src/odr.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr.c,v 1.14 2007-01-03 08:42:15 adam Exp $
- *
  */
 
 /**
@@ -22,6 +19,7 @@
 
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
+#include <yaz/snprintf.h>
 #include "odr-priv.h"
 
 static int log_level=0;
@@ -183,7 +181,7 @@ void odr_set_stream(ODR o, void *handle,
                                          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;
 }
@@ -214,13 +212,13 @@ ODR odr_createmem(int direction)
 
     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);
@@ -241,16 +239,16 @@ void odr_reset(ODR o)
     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);
@@ -259,10 +257,10 @@ void odr_reset(ODR 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);
@@ -276,7 +274,7 @@ void odr_setbuf(ODR o, char *buf, int len, int can_grow)
     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;
 }
@@ -295,21 +293,14 @@ void odr_printf(ODR o, const char *fmt, ...)
     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);
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab