X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fwrbuf.c;fp=src%2Fwrbuf.c;h=344e5742cc00e71ba8d6ad8a1deff7892e918724;hp=871028d53d93708a7f52c4ede3efc391c59127c1;hb=e529ed18a6825f980bb16b230e56c6d53743ced1;hpb=b8fbcf6d00bc77c4ccdb02d68c9316f3263be15a

diff --git a/src/wrbuf.c b/src/wrbuf.c
index 871028d..344e574 100644
--- a/src/wrbuf.c
+++ b/src/wrbuf.c
@@ -169,8 +169,9 @@ void wrbuf_printf(WRBUF b, const char *fmt, ...)
     va_end(ap);
 }
 
-int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
-                        size_t size, int cdata)
+int wrbuf_iconv_write2(WRBUF b, yaz_iconv_t cd, const char *buf,
+                       size_t size,
+                       void (*wfunc)(WRBUF, const char *, size_t))
 {
     int ret = 0;
     if (cd)
@@ -193,40 +194,24 @@ int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
                     break;
                 }
             }
-            switch (cdata)
-            {
-            case 0:
-                wrbuf_write(b, outbuf, outp - outbuf);
-                break;
-            case 1:
-                wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
-                break;
-            case 2:
-                wrbuf_json_write(b, outbuf, outp - outbuf);
-                break;
-            }
+            (*wfunc)(b, outbuf, outp - outbuf);
         }
     }
     else
-    {
-        switch (cdata)
-        {
-        case 0:
-            wrbuf_write(b, buf, size);
-            break;
-        case 1:
-            wrbuf_xmlputs_n(b, buf, size);
-            break;
-        case 2:
-            wrbuf_json_write(b, buf, size);
-        }
-    }
+        (*wfunc)(b, buf, size);
     return ret;
 }
 
+int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+                        size_t size, int cdata)
+{
+    return wrbuf_iconv_write2(b, cd, buf, size,
+                              cdata ? wrbuf_xmlputs_n : wrbuf_write);
+}
+
 void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
 {
-    wrbuf_iconv_write_x(b, cd, buf, size, 0);
+    wrbuf_iconv_write2(b, cd, buf, size, wrbuf_write);
 }
 
 void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
@@ -243,23 +228,23 @@ void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch)
 
 void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
 {
-    wrbuf_iconv_write_x(b, cd, buf, size, 1);
+    wrbuf_iconv_write2(b, cd, buf, size, wrbuf_xmlputs_n);
 }
 
 void wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, const char *strz)
 {
-    wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1);
+    wrbuf_iconv_write2(b, cd, strz, strlen(strz), wrbuf_xmlputs_n);
 }
 
 void wrbuf_iconv_json_write(WRBUF b, yaz_iconv_t cd,
                             const char *buf, size_t size)
 {
-    wrbuf_iconv_write_x(b, cd, buf, size, 2);
+    wrbuf_iconv_write2(b, cd, buf, size, wrbuf_json_write);
 }
 
 void wrbuf_iconv_json_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
 {
-    wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 2);
+    wrbuf_iconv_write2(b, cd, strz, strlen(strz), wrbuf_json_write);
 }
 
 void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd)