summaryrefslogtreecommitdiffstats
path: root/template.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-17 13:20:55 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-17 13:20:55 +0100
commitbcc3b2aef74534cebc39f1351927756d144a7942 (patch)
tree9c182438089a48f4653be0a34cc6105348d26dfb /template.c
parentb9cc60deeb0201e263ee011a20b0bce4eb6001f4 (diff)
parent68c13f3f6a691c7f854e6fa4caff43295896dbde (diff)
downloadrsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.zip
rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.gz
rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.xz
Merge branch 'v5-devel'
Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
Diffstat (limited to 'template.c')
-rw-r--r--template.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/template.c b/template.c
index 1ea2575..86987e9 100644
--- a/template.c
+++ b/template.c
@@ -86,9 +86,9 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
DEFiRet;
struct templateEntry *pTpe;
size_t iBuf;
- unsigned short bMustBeFreed;
+ unsigned short bMustBeFreed = 0;
uchar *pVal;
- size_t iLenVal;
+ size_t iLenVal = 0;
assert(pTpl != NULL);
assert(pMsg != NULL);
@@ -1055,7 +1055,6 @@ void tplDeleteAll(void)
{
struct template *pTpl, *pTplDel;
struct templateEntry *pTpe, *pTpeDel;
- rsRetVal iRetLocal;
BEGINfunc
pTpl = tplRoot;
@@ -1078,7 +1077,7 @@ void tplDeleteAll(void)
case FIELD:
/* check if we have a regexp and, if so, delete it */
if(pTpeDel->data.field.has_regex != 0) {
- if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
+ if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
regexp.regfree(&(pTpeDel->data.field.re));
}
}
@@ -1106,7 +1105,6 @@ void tplDeleteNew(void)
{
struct template *pTpl, *pTplDel;
struct templateEntry *pTpe, *pTpeDel;
- rsRetVal iRetLocal;
BEGINfunc
@@ -1135,7 +1133,7 @@ void tplDeleteNew(void)
case FIELD:
/* check if we have a regexp and, if so, delete it */
if(pTpeDel->data.field.has_regex != 0) {
- if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
+ if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
regexp.regfree(&(pTpeDel->data.field.re));
}
}