X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fwrbuf.c;h=31729b031c11fc362b04a686d0acd6a9c7123518;hp=f9affa3bb9626b0c400c1e28ebee2aec126dcd5d;hb=99f1879827d5be93a6363b5adbc83b824135dd88;hpb=a7bff1cefa274c110b80458cba718db5ed0fd97d

diff --git a/src/wrbuf.c b/src/wrbuf.c
index f9affa3..31729b0 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.
  */
 
@@ -35,8 +35,11 @@ WRBUF wrbuf_alloc(void)
 
 void wrbuf_destroy(WRBUF b)
 {
-    xfree(b->buf);
-    xfree(b);
+    if (b)
+    {
+        xfree(b->buf);
+        xfree(b);
+    }
 }
 
 void wrbuf_rewind(WRBUF b)
@@ -44,9 +47,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,29 +64,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;
 }
 
-void wrbug_put(WRBUF b, const char *buf)
-{
-    wrbuf_write(b, buf, strlen(buf));
-}
-
-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)
@@ -94,7 +90,6 @@ int wrbuf_puts_replace_char(WRBUF b, const char *buf,
             wrbuf_putc(b, *buf);
         buf++;
     }
-    return 0;
 }
 
 void wrbuf_chop_right(WRBUF b)
@@ -105,14 +100,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)
@@ -143,7 +138,6 @@ int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size)
         }
         cp++;
     }
-    return 0;
 }
 
 void wrbuf_printf(WRBUF b, const char *fmt, ...)
@@ -158,12 +152,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)
@@ -191,34 +185,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)
@@ -266,6 +259,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