diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 17:32:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 17:32:26 +0200 |
| commit | 80701b698802efe1bcecac09afcd393dd4bd3d5c (patch) | |
| tree | eb85f7d9184ed1d1a8963b55788c7378d38c4aff /runtime/conf.c | |
| parent | cefa1fac08d4d67a4139146016fef206d59d5ddc (diff) | |
| download | rsyslog-80701b698802efe1bcecac09afcd393dd4bd3d5c.tar.gz rsyslog-80701b698802efe1bcecac09afcd393dd4bd3d5c.tar.xz rsyslog-80701b698802efe1bcecac09afcd393dd4bd3d5c.zip | |
more cleanup, working on emergency config system
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 8c7bc7b6..425d6259 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -75,7 +75,7 @@ #endif /* forward definitions */ -static rsRetVal cfline(rsconf_t *conf, uchar *line, rule_t **pfCurr); +//static rsRetVal cfline(rsconf_t *conf, uchar *line, rule_t **pfCurr); /* static data */ @@ -715,6 +715,7 @@ finalize_it: } +#if 0 /* read the filter part of a configuration line and store the filter * in the supplied rule_t * rgerhards, 2007-08-01 @@ -751,6 +752,7 @@ static rsRetVal cflineDoFilter(uchar **pp, rule_t *f) finalize_it: RETiRet; } +#endif /* process the action part of a selector line @@ -817,6 +819,7 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) } +#if 0 /* Process a configuration file line in traditional "filter selector" format * or one that builds upon this format. Note that ppRule may be a NULL pointer, * which is valid and happens if there is no previous line (right at the start @@ -894,6 +897,7 @@ cfline(rsconf_t *conf, uchar *line, rule_t **pfCurr) RETiRet; } +#endif /* return the current number of active actions @@ -926,7 +930,6 @@ CODESTARTobjQueryInterface(conf) pIf->doNameLine = doNameLine; pIf->cfsysline = cfsysline; pIf->doModLoad = doModLoad; - pIf->cfline = cfline; pIf->GetNbrActActions = GetNbrActActions; finalize_it: |