summaryrefslogtreecommitdiff
path: root/runtime/stringbuf.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-03-11 19:04:23 +0100
committerMichael Biebl <biebl@debian.org>2014-03-11 19:04:23 +0100
commit5fccf771f37973a2cea543fbdf1ed94ed9706faf (patch)
tree80b547300bfb6f1c8ffae16a8af9dea03c3fb75d /runtime/stringbuf.c
parent0c656246c6818b9fd0426411ed1cf926fbbc907d (diff)
downloadrsyslog-5fccf771f37973a2cea543fbdf1ed94ed9706faf.tar.gz
Imported Upstream version 7.4.8upstream/7.4.8
Diffstat (limited to 'runtime/stringbuf.c')
-rw-r--r--runtime/stringbuf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c
index cb4f045..13f3871 100644
--- a/runtime/stringbuf.c
+++ b/runtime/stringbuf.c
@@ -107,7 +107,8 @@ finalize_it:
/* a helper function for rsCStr*Strf()
*/
-static rsRetVal rsCStrConstructFromszStrv(cstr_t **ppThis, uchar *fmt, va_list ap)
+static rsRetVal rsCStrConstructFromszStrv(cstr_t **ppThis, char *fmt, va_list ap) __attribute__((format(gnu_printf,2, 0)));
+static rsRetVal rsCStrConstructFromszStrv(cstr_t **ppThis, char *fmt, va_list ap)
{
DEFiRet;
cstr_t *pThis;
@@ -147,7 +148,7 @@ rsRetVal rsCStrConstructFromszStrf(cstr_t **ppThis, char *fmt, ...)
va_list ap;
va_start(ap, fmt);
- iRet = rsCStrConstructFromszStrv(ppThis, (uchar*)fmt, ap);
+ iRet = rsCStrConstructFromszStrv(ppThis, fmt, ap);
va_end(ap);
RETiRet;
@@ -315,7 +316,7 @@ rsRetVal rsCStrAppendStrf(cstr_t *pThis, uchar *fmt, ...)
cstr_t *pStr = NULL;
va_start(ap, fmt);
- iRet = rsCStrConstructFromszStrv(&pStr, fmt, ap);
+ iRet = rsCStrConstructFromszStrv(&pStr, (char*)fmt, ap);
va_end(ap);
CHKiRet(iRet);
@@ -563,7 +564,7 @@ rsRetVal cstrTrimTrailingWhiteSpace(cstr_t *pThis)
}
/* i now is the new string length! */
pThis->iStrLen = i;
- pThis->pBuf[pThis->iStrLen] = '0'; /* we always have this space */
+ pThis->pBuf[pThis->iStrLen] = '\0'; /* we always have this space */
done: return RS_RET_OK;
}