X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fwrbuf.h;h=eca86632a57f48a7d4ed70710045cfc7407582dd;hp=56b5e605c74a830a508cc5fe0209c6cce0addf46;hb=5242cb5a8634bfa38b9333ff7f903e718ac6e292;hpb=22f541bb03c1fc3e9edbab5f4aaf01e9232bd003

diff --git a/include/yaz/wrbuf.h b/include/yaz/wrbuf.h
index 56b5e60..eca8663 100644
--- a/include/yaz/wrbuf.h
+++ b/include/yaz/wrbuf.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data.
+ * Copyright (C) 1995-2012 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -53,7 +53,7 @@ YAZ_EXPORT WRBUF wrbuf_alloc(void);
 
 /** \brief destroy WRBUF and its buffer
     \param b WRBUF
- 
+
     For YAZ 4.0.2 WRBUF b may be NULL.
  */
 YAZ_EXPORT void wrbuf_destroy(WRBUF b);
@@ -63,19 +63,33 @@ YAZ_EXPORT void wrbuf_destroy(WRBUF b);
  */
 YAZ_EXPORT void wrbuf_rewind(WRBUF b);
 
-/** \brief append constant size buffer to WRBU
+/** \brief append constant size buffer to WRBUF
     \param b WRBUF
     \param buf buffer
     \param size size of buffer
  */
 YAZ_EXPORT void wrbuf_write(WRBUF b, const char *buf, size_t size);
 
+/** \brief inserts buffer into WRBUF at some position
+    \param b WRBUF
+    \param pos position (0=beginning)
+    \param buf buffer
+    \param size size of buffer
+ */
+YAZ_EXPORT void wrbuf_insert(WRBUF b, size_t pos, const char *buf, size_t size);
+
 /** \brief appends C-string to WRBUF
     \param b WRBUF
     \param buf C-string (0-terminated)
  */
 YAZ_EXPORT void wrbuf_puts(WRBUF b, const char *buf);
 
+/** \brief appends C-string to WRBUF - void pointer variant
+    \param buf C-string
+    \param client_data assumed WRBUF
+*/
+YAZ_EXPORT void wrbuf_vp_puts(const char *buf, void *client_data);
+
 /** \brief writes buffer of certain size to WRBUF and XML encode (as CDATA)
     \param b WRBUF
     \param cp CDATA
@@ -95,7 +109,7 @@ YAZ_EXPORT void wrbuf_xmlputs(WRBUF b, const char *cp);
     \param from character "from"
     \param to charcter "to"
 */
-YAZ_EXPORT void wrbuf_puts_replace_char(WRBUF b, const char *buf, 
+YAZ_EXPORT void wrbuf_puts_replace_char(WRBUF b, const char *buf,
                                         const char from, const char to);
 
 /** \brief writes C-string to WRBUF and escape non-ASCII characters
@@ -180,7 +194,7 @@ YAZ_EXPORT void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch);
 /** \brief iconv reset(flush) to WRBUF
     \param b
     \param cd iconv handle
-    
+
     This function calls iconv(cd, 0, 0, ..) to make it
     flush any remaining content.
 */
@@ -197,7 +211,7 @@ YAZ_EXPORT void wrbuf_chop_right(WRBUF b);
  */
 YAZ_EXPORT void wrbuf_cut_right(WRBUF b, size_t no_to_remove);
 
-/** \brief grow WRBUF larger 
+/** \brief grow WRBUF larger
     \param b WRBUF
     \param minsize make WRBUF at least this size
 
@@ -215,7 +229,7 @@ YAZ_EXPORT int wrbuf_grow(WRBUF b, size_t minsize);
 YAZ_EXPORT const char *wrbuf_cstr(WRBUF b);
 
 #define wrbuf_putc(b, c) \
-    (((b)->pos >= (b)->size ? wrbuf_grow(b, 1) : 0),  \
+    ((void) ((b)->pos >= (b)->size ? wrbuf_grow(b, 1) : 0),  \
     (b)->buf[(b)->pos++] = (c), 0)
 
 YAZ_END_CDECL