X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fwrbuf.h;h=2003916b6fee50e057e20f095a8873c272c885e9;hb=2da4a703da966708bb2e2bd4115ee9c348397667;hp=c69c3ad2cfb9898043d34ee81b3f159735e93da9;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;p=yaz-moved-to-github.git diff --git a/include/yaz/wrbuf.h b/include/yaz/wrbuf.h index c69c3ad..2003916 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-2008 Index Data. + * Copyright (C) 1995-2010 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: @@ -24,7 +24,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: wrbuf.h,v 1.29 2008-01-30 19:58:24 adam Exp $ */ /** * \file wrbuf.h @@ -57,17 +56,19 @@ YAZ_EXPORT void wrbuf_destroy(WRBUF b); YAZ_EXPORT void wrbuf_rewind(WRBUF b); /** \brief writes (append) buffer to WRBUF */ -YAZ_EXPORT int wrbuf_write(WRBUF b, const char *buf, int size); -/** \brief appends C-string to WRBUF */ -YAZ_EXPORT int wrbuf_puts(WRBUF b, const char *buf); +YAZ_EXPORT void wrbuf_write(WRBUF b, const char *buf, size_t size); +/** \brief appends C-string to WRBUF (returns int) */ +YAZ_EXPORT void wrbuf_puts(WRBUF b, const char *buf); +/** \brief appends C-string to WRBUF (void) */ +YAZ_EXPORT void wrbuf_vputs(const char *buf, void *client_data); /** \brief writes buffer to WRBUF and XML encode (as CDATA) */ -YAZ_EXPORT int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size); +YAZ_EXPORT void wrbuf_xmlputs_n(WRBUF b, const char *cp, size_t size); /** \brief writes C-String to WRBUF and XML encode (as CDATA) */ -YAZ_EXPORT int wrbuf_xmlputs(WRBUF b, const char *cp); +YAZ_EXPORT void wrbuf_xmlputs(WRBUF b, const char *cp); -YAZ_EXPORT int wrbuf_puts_replace_char(WRBUF b, const char *buf, - const char from, const char to); +YAZ_EXPORT void wrbuf_puts_replace_char(WRBUF b, const char *buf, + const char from, const char to); /** \brief writes buffer to WRBUF and escape non-ASCII characters */ YAZ_EXPORT void wrbuf_puts_escaped(WRBUF b, const char *str); @@ -82,16 +83,16 @@ YAZ_EXPORT void wrbuf_printf(WRBUF b, const char *fmt, ...) #endif ; -YAZ_EXPORT int wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, - int size); -YAZ_EXPORT int wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, - const char *buf, int size); -YAZ_EXPORT int wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, - const char *strz); +YAZ_EXPORT void wrbuf_iconv_write(WRBUF b, yaz_iconv_t cd, const char *buf, + size_t size); +YAZ_EXPORT void wrbuf_iconv_write_cdata(WRBUF b, yaz_iconv_t cd, + const char *buf, size_t size); +YAZ_EXPORT void wrbuf_iconv_puts_cdata(WRBUF b, yaz_iconv_t cd, + const char *strz); -YAZ_EXPORT int wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz); +YAZ_EXPORT void wrbuf_iconv_puts(WRBUF b, yaz_iconv_t cd, const char *strz); -YAZ_EXPORT int wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch); +YAZ_EXPORT void wrbuf_iconv_putchar(WRBUF b, yaz_iconv_t cd, int ch); YAZ_EXPORT void wrbuf_iconv_reset(WRBUF b, yaz_iconv_t cd); @@ -104,7 +105,7 @@ YAZ_EXPORT void wrbuf_cut_right(WRBUF b, size_t no_to_remove); /** \brief grow WRBUF larger This function is normally not used by applications */ -YAZ_EXPORT int wrbuf_grow(WRBUF b, int minsize); +YAZ_EXPORT int wrbuf_grow(WRBUF b, size_t minsize); #define wrbuf_len(b) ((b)->pos) #define wrbuf_buf(b) ((b)->buf) @@ -121,6 +122,7 @@ YAZ_END_CDECL /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab