diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:37:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:37:04 +0200 |
| commit | 30b0a28786c5c198223cf2fa354d906710f68e0a (patch) | |
| tree | 38e6027d5a9d2bf6d1e6424ff70ecc20ac6a6b6a /runtime/ruleset.c | |
| parent | fba7f66590c6c60c1c08585d210734884654c912 (diff) | |
| parent | dac70ef76e14e677f11579b7d11d13ddd92c25c8 (diff) | |
| download | rsyslog-30b0a28786c5c198223cf2fa354d906710f68e0a.tar.gz rsyslog-30b0a28786c5c198223cf2fa354d906710f68e0a.tar.bz2 rsyslog-30b0a28786c5c198223cf2fa354d906710f68e0a.zip | |
Merge branch 'v6-stable'
Conflicts:
runtime/msg.c
runtime/ruleset.c
runtime/ruleset.h
Diffstat (limited to 'runtime/ruleset.c')
| -rw-r--r-- | runtime/ruleset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index 2788f34c..c384663a 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -312,8 +312,8 @@ GetRulesetQueue(ruleset_t *pThis) /* Find the ruleset with the given name and return a pointer to its object. */ -static rsRetVal -GetRuleset(rsconf_t *conf, ruleset_t **ppRuleset, uchar *pszName) +rsRetVal +rulesetGetRuleset(rsconf_t *conf, ruleset_t **ppRuleset, uchar *pszName) { DEFiRet; assert(ppRuleset != NULL); @@ -335,7 +335,7 @@ SetDefaultRuleset(rsconf_t *conf, uchar *pszName) DEFiRet; assert(pszName != NULL); - CHKiRet(GetRuleset(conf, &pRuleset, pszName)); + CHKiRet(rulesetGetRuleset(conf, &pRuleset, pszName)); conf->rulesets.pDflt = pRuleset; dbgprintf("default rule set changed to %p: '%s'\n", pRuleset, pszName); @@ -353,7 +353,7 @@ SetCurrRuleset(rsconf_t *conf, uchar *pszName) DEFiRet; assert(pszName != NULL); - CHKiRet(GetRuleset(conf, &pRuleset, pszName)); + CHKiRet(rulesetGetRuleset(conf, &pRuleset, pszName)); conf->rulesets.pCurr = pRuleset; dbgprintf("current rule set changed to %p: '%s'\n", pRuleset, pszName); @@ -602,7 +602,7 @@ CODESTARTobjQueryInterface(ruleset) pIf->SetName = setName; pIf->DebugPrintAll = debugPrintAll; pIf->GetCurrent = GetCurrent; - pIf->GetRuleset = GetRuleset; + pIf->GetRuleset = rulesetGetRuleset; pIf->SetDefaultRuleset = SetDefaultRuleset; pIf->SetCurrRuleset = SetCurrRuleset; pIf->GetRulesetQueue = GetRulesetQueue; |