/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
void wrbuf_destroy(WRBUF b)
{
- xfree(b->buf);
- xfree(b);
+ if (b)
+ {
+ xfree(b->buf);
+ xfree(b);
+ }
}
void wrbuf_rewind(WRBUF b)
b->pos += size;
}
+void wrbuf_insert(WRBUF b, size_t pos, const char *buf, size_t size)
+{
+ if (size <= 0 || pos > b->pos)
+ return;
+ if (b->pos + size >= b->size)
+ wrbuf_grow(b, size);
+ memmove(b->buf + pos + size, b->buf + pos, b->pos - pos);
+ memcpy(b->buf + pos, buf, size);
+ b->pos += size;
+}
+
void wrbuf_puts(WRBUF b, const char *buf)
{
wrbuf_write(b, buf, strlen(buf));
}
-void wrbuf_vputs(const char *buf, void *client_data)
+void wrbuf_vp_puts(const char *buf, void *client_data)
{
- wrbuf_write((WRBUF) client_data, buf, strlen(buf));
+ WRBUF b = (WRBUF) client_data;
+ wrbuf_puts(b, buf);
}
-void 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)
va_end(ap);
}
-static void wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
- size_t size, int cdata)
+int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf,
+ size_t size, int cdata)
{
+ int ret = 0;
if (cd)
{
char outbuf[128];
{
int e = yaz_iconv_error(cd);
if (e != YAZ_ICONV_E2BIG)
+ {
+ ret = -1;
break;
+ }
}
if (cdata)
wrbuf_xmlputs_n(b, outbuf, outp - outbuf);
else
wrbuf_write(b, buf, size);
}
+ return ret;
}
void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, size_t size)