+ return ret;
+}
+
+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);
+}
+
+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_write_x(b, cd, buf, size, 1);
+}
+
+void wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, const char *strz)
+{
+ wrbuf_iconv_write_x(b, cd, strz, strlen(strz), 1);
+}
+
+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)
+{
+ wrbuf_putc(b, '\0'); /* add '\0' */
+ (b->pos)--; /* don't include '\0' in count */
+ return b->buf;