Merge branch 'v5-devel'

Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c

1 files changed, 4 insertions, 6 deletions

diff --git a/template.c b/template.c
index 1ea2575a..86987e98 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));
 					}
 				}