diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-15 15:01:30 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-15 15:01:30 +0200 |
| commit | e579791a78267353566c79c83043805a54d85b74 (patch) | |
| tree | ca0fdb7558eef3fea13139bf5c7aaf7055ae8446 /runtime/rsconf.c | |
| parent | 384cf4702406a69825190ce0e28cfbcd1e3ccb8e (diff) | |
| download | rsyslog-e579791a78267353566c79c83043805a54d85b74.tar.gz rsyslog-e579791a78267353566c79c83043805a54d85b74.tar.xz rsyslog-e579791a78267353566c79c83043805a54d85b74.zip | |
more cleanup
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 5df4c2c8..0ccf2d57 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -403,7 +403,7 @@ void cnfDoRule(struct cnfrule *cnfrule) cnfDoActlst(cnfrule->actlst, pRule); - CHKiRet(ruleset.AddRule(loadConf, rule.GetAssRuleset(pRule), &pRule)); + CHKiRet(ruleset.AddRule(rule.GetAssRuleset(pRule), &pRule)); finalize_it: //TODO: do something with error states @@ -832,7 +832,7 @@ setCurrRuleset(void __attribute__((unused)) *pVal, uchar *pszName) if(localRet == RS_RET_NOT_FOUND) { DBGPRINTF("begin new current rule set '%s'\n", pszName); CHKiRet(ruleset.Construct(&pRuleset)); - CHKiRet(ruleset.SetName(ourConf, pRuleset, pszName)); + CHKiRet(ruleset.SetName(pRuleset, pszName)); CHKiRet(ruleset.ConstructFinalize(ourConf, pRuleset)); } else { ABORT_FINALIZE(localRet); @@ -1030,7 +1030,7 @@ initLegacyConf(void) DBGPRINTF("doing legacy config system init\n"); /* construct the default ruleset */ ruleset.Construct(&pRuleset); - ruleset.SetName(loadConf, pRuleset, UCHAR_CONSTANT("RSYSLOG_DefaultRuleset")); + ruleset.SetName(pRuleset, UCHAR_CONSTANT("RSYSLOG_DefaultRuleset")); ruleset.ConstructFinalize(loadConf, pRuleset); /* now register config handlers */ |