Merge branch 'master' into sru_2_0

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

diff --git a/src/odr.c b/src/odr.c
index 7013ad7..e424b20 100644 (file)
--- a/src/odr.c
+++ b/src/odr.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 
@@ -64,7 +64,7 @@ void odr_perror(ODR o, const char *message)
     fprintf(stderr, "%s: %s (code %d:%d)", message, odr_errlist[err], err, x);
     if (e && *e)
         fprintf(stderr, " element %s", e);
-    
+
     fprintf(stderr, "\n");
     if (element_path)
     {
@@ -147,7 +147,7 @@ void odr_FILE_write(ODR o, void *handle, int type,
     for (i = 0; i < len; i++)
     {
         unsigned c = ((const unsigned char *) buf)[i];
-        if (i == 2000 && len > 3100)
+        if (i == 20000 && len > 31000)
         {
             fputs(" ..... ", (FILE*) handle);
                 i = len - 1000;
@@ -175,8 +175,9 @@ void odr_setprint(ODR o, FILE *file)
     odr_set_stream(o, file, odr_FILE_write, odr_FILE_close);
 }
 
+
 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, int len),
                     void (*stream_close)(void *handle))
@@ -253,7 +254,7 @@ void odr_reset(ODR o)
         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);
@@ -271,8 +272,8 @@ void odr_destroy(ODR o)
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)
 {
     odr_seterror(o, ONONE, 0);
-    o->bp = (unsigned char *) buf;
-    o->buf = (unsigned char *) buf;
+    o->bp = buf;
+    o->buf = buf;
     o->op->can_grow = can_grow;
     o->top = o->pos = 0;
     o->size = len;