diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 10:52:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 10:52:06 +0200 |
| commit | 8eb10a7105dce1dc3ffc44b291de73d82bd04799 (patch) | |
| tree | e3c70740599127009b6009a2846d8274e67c8900 /runtime/vm.c | |
| parent | 675d46f5b59f64e378968baa5e0dec6810090287 (diff) | |
| parent | c53ca3a23429e750aeb6ab1c3600ae8ecb3c8ac6 (diff) | |
| download | rsyslog-8eb10a7105dce1dc3ffc44b291de73d82bd04799.tar.gz rsyslog-8eb10a7105dce1dc3ffc44b291de73d82bd04799.tar.bz2 rsyslog-8eb10a7105dce1dc3ffc44b291de73d82bd04799.zip | |
Merge branch 'omfile'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/vm.c')
| -rw-r--r-- | runtime/vm.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/runtime/vm.c b/runtime/vm.c index 8cbf9e12..d7cd52d5 100644 --- a/runtime/vm.c +++ b/runtime/vm.c @@ -82,6 +82,7 @@ rsfrAddFunction(uchar *szName, prsf_t rsf) /* unique name, so add to head of list */ CHKmalloc(pEntry = calloc(1, sizeof(rsf_entry_t))); CHKiRet(rsCStrConstructFromszStr(&pEntry->pName, szName)); + CHKiRet(cstrFinalize(pEntry->pName)); pEntry->rsf = rsf; pEntry->pNext = funcRegRoot; funcRegRoot = pEntry; @@ -167,7 +168,7 @@ rsfrRemoveAll(void) while(pEntry != NULL) { pEntryDel = pEntry; pEntry = pEntry->pNext; - rsCStrDestruct(&pEntryDel->pName); + cstrDestruct(&pEntryDel->pName); free(pEntryDel); } funcRegRoot = NULL; @@ -405,6 +406,7 @@ CODESTARTop(STRADD) vmstk.PopString(pThis->pStk, &operand1); CHKiRet(rsCStrAppendCStr(operand1->val.pStr, operand2->val.pStr)); + CHKiRet(cstrFinalize(operand1->val.pStr)); /* we have a result, so let's push it */ vmstk.Push(pThis->pStk, operand1); @@ -554,12 +556,12 @@ rsf_tolower(vmstk_t *pStk, int numOperands) ABORT_FINALIZE(RS_RET_INVLD_NBR_ARGUMENTS); /* pop args and do operaton */ - CHKiRet(rsCStrConstruct(&pcstr)); + CHKiRet(cstrConstruct(&pcstr)); vmstk.PopString(pStk, &operand1); - pSrc = rsCStrGetSzStr(operand1->val.pStr); - iStrlen = strlen((char*)pSrc); + pSrc = cstrGetSzStr(operand1->val.pStr); + iStrlen = strlen((char*)pSrc); // TODO: use count from string! while(iStrlen--) { - CHKiRet(rsCStrAppendChar(pcstr, tolower(*pSrc++))); + CHKiRet(cstrAppendChar(pcstr, tolower(*pSrc++))); } /* Store result and cleanup */ |