diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-13 08:27:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-13 08:27:47 +0200 |
| commit | 2d2653d9badcf7885cacd49ee5ccc7b62b98ad25 (patch) | |
| tree | 1f60b820bb6222c613e692ee5712f54a923a2245 /runtime/stringbuf.c | |
| parent | 7f33f2bd0e54e8a5397e257a0823206277a70bc0 (diff) | |
| parent | 45385a5839c182e6898aac5936667f31e2bbd6f3 (diff) | |
| download | rsyslog-2d2653d9badcf7885cacd49ee5ccc7b62b98ad25.tar.gz rsyslog-2d2653d9badcf7885cacd49ee5ccc7b62b98ad25.tar.bz2 rsyslog-2d2653d9badcf7885cacd49ee5ccc7b62b98ad25.zip | |
Merge branch 'master' into nextmaster
Diffstat (limited to 'runtime/stringbuf.c')
| -rw-r--r-- | runtime/stringbuf.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c index 75d2eac4..0d8e7e83 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; @@ -322,7 +321,7 @@ rsRetVal rsCStrAppendStrf(cstr_t *pThis, uchar *fmt, ...) CHKiRet(iRet); iRet = cstrAppendCStr(pThis, pStr); - rsCStrDestruct(pStr); + rsCStrDestruct(&pStr); finalize_it: RETiRet; } |