summaryrefslogtreecommitdiff
path: root/stringbuf.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2008-03-29 12:14:35 +0100
committerMichael Biebl <biebl@debian.org>2008-03-29 12:14:35 +0100
commitb0dbc76eaaf1c7f51b3aea1ea359b3a7e9882d20 (patch)
treeb52cf2f47cd3e0baa4e60fc108d83d253a5a2218 /stringbuf.h
parent6baee6e64e3c9427ced7724d2e4378e1d00dbf11 (diff)
downloadrsyslog-b0dbc76eaaf1c7f51b3aea1ea359b3a7e9882d20.tar.gz
Imported Debian patch 1.19.7-1debian/1.19.7-1
Diffstat (limited to 'stringbuf.h')
-rw-r--r--[-rwxr-xr-x]stringbuf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/stringbuf.h b/stringbuf.h
index c007b59..2c3f4c3 100755..100644
--- a/stringbuf.h
+++ b/stringbuf.h
@@ -113,7 +113,7 @@ rsRetVal rsCStrAppendInt(rsCStrObj *pThis, int i);
uchar* rsCStrGetSzStr(rsCStrObj *pThis);
uchar* rsCStrGetSzStrNoNULL(rsCStrObj *pThis);
rsRetVal rsCStrSetSzStr(rsCStrObj *pThis, uchar *pszNew);
-uchar* rsCStrConvSzStrAndDestruct(rsCStrObj *pThis);
+rsRetVal rsCStrConvSzStrAndDestruct(rsCStrObj *pThis, uchar **ppSz, int bRetNULL);
int rsCStrCStrCmp(rsCStrObj *pCS1, rsCStrObj *pCS2);
int rsCStrSzStrCmp(rsCStrObj *pCS1, uchar *psz, size_t iLenSz);
int rsCStrOffsetSzStrCmp(rsCStrObj *pCS1, size_t iOffset, uchar *psz, size_t iLenSz);
@@ -125,7 +125,7 @@ int rsCStrSzStrMatchRegex(rsCStrObj *pCS1, uchar *psz);
/* now come inline-like functions */
#ifdef NDEBUG
-# define rsCStrLen(x) ((x)->iStrLen)
+# define rsCStrLen(x) ((int)((x)->iStrLen))
#else
int rsCStrLen(rsCStrObj *pThis);
#endif