#endif
;
-/** \brief general writer of string using iconv and cdata
+/** \brief General writer of string using iconv and cdata
+ \param b WRBUF
+ \param cd iconv handle (0 for no conversion)
+ \param buf buffer
+ \param size size of buffer
+ \param wfunc write handler (that takes WRBUF only)
+ \returns -1 if invalid sequence was encountered (truncation in effect)
+ \returns 0 if buffer could be converted and written
+*/
+int wrbuf_iconv_write2(WRBUF b, yaz_iconv_t cd, const char *buf,
+ size_t size,
+ void (*wfunc)(WRBUF, const char *, size_t));
+
+/** \brief writer of string using iconv and cdata
+
+ Obsolete: use wrbuf_iconv_write2 instead.
\param b WRBUF
\param cd iconv handle (0 for no conversion)
\param buf buffer
\returns 0 if buffer could be converted and written
*/
int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
- size_t size, int cdata);
+ size_t size, int cdata)
+#ifdef __GNUC__
+ __attribute__ ((deprecated))
+#endif
+ ;
-/** \brief iconv converts buffer and appends to WRBUF
+/** \brief Converts buffer using iconv and appends to WRBUF
\param b WRBUF
\param cd iconv handle
\param buf buffer
YAZ_EXPORT void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf,
size_t size);
-/** \brief iconv converts buffer and appends to WRBUF as XML CDATA
+/** \brief Converts buffer using iconv and appends to WRBUF as XML CDATA
\param b WRBUF
\param cd iconv handle
\param buf buffer
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)
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)
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)