diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:18:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:18:43 +0200 |
| commit | 1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2 (patch) | |
| tree | 69af95cebb33eada96c966fa226ac7e6e7696a0c /runtime/ruleset.c | |
| parent | e4d87aac957ea639935f56fb8b03f3c03d037491 (diff) | |
| parent | 68538a9013c59036d8825ef97a0a91552a9e7e99 (diff) | |
| download | rsyslog-1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2.tar.gz rsyslog-1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2.tar.xz rsyslog-1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
runtime/msg.c
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 69968a52..2f307f05 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -315,8 +315,8 @@ GetRulesetQueue(ruleset_t *pThis) /* Find the ruleset with the given name and return a pointer to its object. */ -static rsRetVal -GetRuleset(ruleset_t **ppRuleset, uchar *pszName) +rsRetVal +rulesetGetRuleset(ruleset_t **ppRuleset, uchar *pszName) { DEFiRet; assert(ppRuleset != NULL); @@ -338,7 +338,7 @@ SetDefaultRuleset(uchar *pszName) DEFiRet; assert(pszName != NULL); - CHKiRet(GetRuleset(&pRuleset, pszName)); + CHKiRet(rulesetGetRuleset(&pRuleset, pszName)); pDfltRuleset = pRuleset; dbgprintf("default rule set changed to %p: '%s'\n", pRuleset, pszName); @@ -356,7 +356,7 @@ SetCurrRuleset(uchar *pszName) DEFiRet; assert(pszName != NULL); - CHKiRet(GetRuleset(&pRuleset, pszName)); + CHKiRet(rulesetGetRuleset(&pRuleset, pszName)); pCurrRuleset = pRuleset; dbgprintf("current rule set changed to %p: '%s'\n", pRuleset, pszName); @@ -594,7 +594,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; |