From 5494790ece676ca0a07c0a62cb457338ec4cec90 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 2 Feb 2012 16:47:19 +0100
Subject: bugfix: abort during startup when rsyslog.conf v6+ format was used in
 a certain way

---
 action.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'action.c')

diff --git a/action.c b/action.c
index b4b03ea1..0b0f27c3 100644
--- a/action.c
+++ b/action.c
@@ -1815,10 +1815,11 @@ doSubmitToActionQComplexBatch(action_t *pAction, batch_t *pBatch)
  * Defaults must have been set appropriately during action construct!
  * rgerhards, 2011-08-01
  */
-rsRetVal
+static rsRetVal
 actionApplyCnfParam(action_t *pAction, struct cnfparamvals *pvals)
 {
 	int i;
+	
 	for(i = 0 ; i < pblk.nParams ; ++i) {
 		if(!pvals[i].bUsed)
 			continue;
@@ -1847,7 +1848,6 @@ actionApplyCnfParam(action_t *pAction, struct cnfparamvals *pvals)
 			  "param '%s'\n", pblk.descr[i].name);
 		}
 	}
-	cnfparamvalsDestruct(pvals, &pblk);
 	return RS_RET_OK;
 }
 
-- 
cgit