diff options
| author | Michael Biebl <biebl@debian.org> | 2013-05-15 18:11:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-05-15 18:11:39 +0200 |
| commit | 91bc2744cf85809ac50535129ba4a3c4faae081b (patch) | |
| tree | 9a447d9be1ce5e082e8c964215ad01573bab3b4e /runtime/stringbuf.c | |
| parent | d5e3be17e7d29f5464bf8ed0130e92928ad099e8 (diff) | |
| download | rsyslog-91bc2744cf85809ac50535129ba4a3c4faae081b.tar.gz | |
Imported Upstream version 7.3.15upstream/7.3.15
Diffstat (limited to 'runtime/stringbuf.c')
| -rw-r--r-- | runtime/stringbuf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c index 75d2eac..cb4f045 100644 --- a/runtime/stringbuf.c +++ b/runtime/stringbuf.c @@ -112,13 +112,12 @@ static rsRetVal rsCStrConstructFromszStrv(cstr_t **ppThis, uchar *fmt, va_list a DEFiRet; cstr_t *pThis; va_list ap2; - uchar *sz; int len; assert(ppThis != NULL); va_copy(ap2, ap); - len = vsnprintf(NULL, 0, fmt, ap2); + len = vsnprintf(NULL, 0, (char*)fmt, ap2); va_end(ap2); if(len < 0) @@ -133,7 +132,7 @@ static rsRetVal rsCStrConstructFromszStrv(cstr_t **ppThis, uchar *fmt, va_list a ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); } - vsnprintf(pThis->pBuf, len, fmt, ap); + vsnprintf((char*)pThis->pBuf, len, (char*)fmt, ap); *ppThis = pThis; finalize_it: RETiRet; @@ -142,13 +141,13 @@ finalize_it: /* construct from a printf-style formated string */ -rsRetVal rsCStrConstructFromszStrf(cstr_t **ppThis, uchar *fmt, ...) +rsRetVal rsCStrConstructFromszStrf(cstr_t **ppThis, char *fmt, ...) { DEFiRet; va_list ap; va_start(ap, fmt); - iRet = rsCStrConstructFromszStrv(ppThis, fmt, ap); + iRet = rsCStrConstructFromszStrv(ppThis, (uchar*)fmt, ap); va_end(ap); RETiRet; @@ -313,7 +312,7 @@ rsRetVal rsCStrAppendStrf(cstr_t *pThis, uchar *fmt, ...) { DEFiRet; va_list ap; - cstr_t *pStr; + cstr_t *pStr = NULL; va_start(ap, fmt); iRet = rsCStrConstructFromszStrv(&pStr, fmt, ap); @@ -322,7 +321,7 @@ rsRetVal rsCStrAppendStrf(cstr_t *pThis, uchar *fmt, ...) CHKiRet(iRet); iRet = cstrAppendCStr(pThis, pStr); - rsCStrDestruct(pStr); + rsCStrDestruct(&pStr); finalize_it: RETiRet; } |