+ (*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_write2(b, cd, buf, size, wrbuf_write);
+}
+
+void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
+{
+ wrbuf_iconv_write(b, cd, strz, strlen(strz));
+}
+
+void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch)
+{
+ char buf[1];
+ buf[0] = ch;
+ wrbuf_iconv_write(b, cd, buf, 1);
+}
+
+void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)
+{
+ 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_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_write2(b, cd, buf, size, wrbuf_json_write);
+}
+
+void wrbuf_iconv_json_puts(WRBUF b, yaz_iconv_t cd, const char *strz)
+{
+ wrbuf_iconv_write2(b, cd, strz, strlen(strz), wrbuf_json_write);
+}
+
+void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd)
+{
+ if (cd)
+ {
+ char outbuf[16];
+ size_t outbytesleft = sizeof(outbuf);
+ char *outp = outbuf;
+ size_t r = yaz_iconv(cd, 0, 0, &outp, &outbytesleft);
+ if (r != (size_t) (-1))
+ wrbuf_write(b, outbuf, outp - outbuf);
+ }
+}
+
+const char *wrbuf_cstr(WRBUF b)
+{
+ assert(b && b->pos <= b->size);
+ b->buf[b->pos] = '\0';
+ return b->buf;
+}
+
+const char *wrbuf_cstr_null(WRBUF b)
+{
+ if (!b || b->pos == 0)
+ return 0;
+ assert(b->pos <= b->size);
+ b->buf[b->pos] = '\0';
+ return b->buf;