X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fwrbuf.c;h=e6c53e8de12ccc8a9aebf4f7662aeb3ef8b3b6aa;hp=83b296bfe68ed9c9c1b46f97d9d1ec6d3a1e548a;hb=2db517d64ac08da1f812f33812cf58f6aeb905e3;hpb=52188379291c43d463d4ee6742cf81a700541723

diff --git a/src/wrbuf.c b/src/wrbuf.c
index 83b296b..e6c53e8 100644
--- a/src/wrbuf.c
+++ b/src/wrbuf.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -44,9 +44,9 @@ void wrbuf_rewind(WRBUF b)
     b->pos = 0;
 }
 
-int wrbuf_grow(WRBUF b, int minsize)
+int wrbuf_grow(WRBUF b, size_t minsize)
 {
-    int togrow;
+    size_t togrow;
 
     if (!b->size)
         togrow = 1024;
@@ -61,24 +61,22 @@ int wrbuf_grow(WRBUF b, int minsize)
     return 0;
 }
 
-int wrbuf_write(WRBUF b, const char *buf, int size)
+void wrbuf_write(WRBUF b, const char *buf, size_t size)
 {
     if (size <= 0)
-        return 0;
+        return;
     if (b->pos + size >= b->size)
         wrbuf_grow(b, size);
     memcpy(b->buf + b->pos, buf, size);
     b->pos += size;
-    return 0;
 }
 
-int wrbuf_puts(WRBUF b, const char *buf)
+void wrbuf_puts(WRBUF b, const char *buf)
 {
     wrbuf_write(b, buf, strlen(buf));
-    return 0;
 }
 
-int wrbuf_puts_replace_char(WRBUF b, const char *buf, 
+void wrbuf_puts_replace_char(WRBUF b, const char *buf, 
                             const char from, const char to)
 {
     while(*buf)
@@ -89,7 +87,6 @@ int wrbuf_puts_replace_char(WRBUF b, const char *buf,
             wrbuf_putc(b, *buf);
         buf++;
     }
-    return 0;
 }
 
 void wrbuf_chop_right(WRBUF b)
@@ -100,14 +97,14 @@ void wrbuf_chop_right(WRBUF b)
     }
 }
 
-int wrbuf_xmlputs(WRBUF b, const char *cp)
+void wrbuf_xmlputs(WRBUF b, const char *cp)
 {
-    return wrbuf_xmlputs_n(b, cp, strlen(cp));
+    wrbuf_xmlputs_n(b, cp, strlen(cp));
 }
 
-int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size)
+void wrbuf_xmlputs_n(WRBUF b, const char *cp, size_t size)
 {
-    while (--size >= 0)
+    for (; size; size--)
     {
         /* only TAB,CR,LF of ASCII CTRL are allowed in XML 1.0! */
         if (*cp >= 0 && *cp <= 31)
@@ -138,7 +135,6 @@ int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size)
         }
         cp++;
     }
-    return 0;
 }
 
 void wrbuf_printf(WRBUF b, const char *fmt, ...)
@@ -153,12 +149,12 @@ void wrbuf_printf(WRBUF b, const char *fmt, ...)
     va_end(ap);
 }
 
-static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
-                               int size, int cdata)
+static void wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+                                size_t size, int cdata)
 {
     if (cd)
     {
-        char outbuf[16];
+        char outbuf[128];
         size_t inbytesleft = size;
         const char *inp = buf;
         while (inbytesleft)
@@ -186,34 +182,33 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
         else
             wrbuf_write(b, buf, size);
     }
-    return wrbuf_len(b);
 }
 
-int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
 {
-    return wrbuf_iconv_write_x(b, cd, buf, size, 0);
+    wrbuf_iconv_write_x(b, cd, buf, size, 0);
 }
 
-int wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
+void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
 {
-    return wrbuf_iconv_write(b, cd, strz, strlen(strz));
+    wrbuf_iconv_write(b, cd, strz, strlen(strz));
 }
 
-int wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch)
+void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch)
 {
     char buf[1];
     buf[0] = ch;
-    return wrbuf_iconv_write(b, cd, buf, 1);
+    wrbuf_iconv_write(b, cd, buf, 1);
 }
 
-int wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, int size)
+void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
 {
-    return wrbuf_iconv_write_x(b, cd, buf, size, 1);
+    wrbuf_iconv_write_x(b, cd, buf, size, 1);
 }
 
-int wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, const char *strz)
+void wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, const char *strz)
 {
-    return wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1);
+    wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1);
 }
 
 void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd)
@@ -261,6 +256,7 @@ void wrbuf_write_escaped(WRBUF b, const char *str, size_t len)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab