projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaz_deinit_globals closes FILE log
[yaz-moved-to-github.git]
/
include
/
yaz
/
wrbuf.h
diff --git
a/include/yaz/wrbuf.h
b/include/yaz/wrbuf.h
index
8664c36
..
f5ebf1d
100644
(file)
--- a/
include/yaz/wrbuf.h
+++ b/
include/yaz/wrbuf.h
@@
-242,14
+242,23
@@
YAZ_EXPORT int wrbuf_grow(WRBUF b, size_t minsize);
#define wrbuf_buf(b) ((b)->buf)
/** \brief returns WRBUF content as C-string
#define wrbuf_buf(b) ((b)->buf)
/** \brief returns WRBUF content as C-string
- \param b WRBUF
+ \param b WRBUF (may not be NULL)
\returns C-string
*/
YAZ_EXPORT const char *wrbuf_cstr(WRBUF b);
\returns C-string
*/
YAZ_EXPORT const char *wrbuf_cstr(WRBUF b);
+/** \brief returns WRBUF content as C-string or NULL
+ \param b WRBUF
+ \returns C-string or NULL
+
+ This function returns NULL if either b is NULL or length of buffer is 0
+*/
+YAZ_EXPORT
+const char *wrbuf_cstr_null(WRBUF b);
+
#define wrbuf_putc(b, c) \
((void) ((b)->pos >= (b)->size ? wrbuf_grow(b, 1) : 0), \
#define wrbuf_putc(b, c) \
((void) ((b)->pos >= (b)->size ? wrbuf_grow(b, 1) : 0), \
- (b)->buf[(b)->pos++] = (c), 0)
+ (b)->buf[(b)->pos++] = (c))
/** \brief writes JSON text to WRBUF with escaping
/** \brief writes JSON text to WRBUF with escaping
@@
-285,6
+294,16
@@
void wrbuf_iconv_json_puts(WRBUF b, yaz_iconv_t cd, const char *strz);
YAZ_EXPORT
int wrbuf_sha1_write(WRBUF b, const char *cp, size_t sz, int hexit);
YAZ_EXPORT
int wrbuf_sha1_write(WRBUF b, const char *cp, size_t sz, int hexit);
+/** \brief writes SHA1 text to WRBUF
+ \param b result
+ \param cp C-string
+ \param hexit 1=hex mode; 0=binary
+ \returns 0 if successful
+ \returns -1 on error
+*/
+YAZ_EXPORT
+int wrbuf_sha1_puts(WRBUF b, const char *cp, int hexit);
+
YAZ_END_CDECL
#endif
YAZ_END_CDECL
#endif