summaryrefslogtreecommitdiffstats
path: root/runtime/conf.h
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/conf.h')
-rw-r--r--runtime/conf.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/runtime/conf.h b/runtime/conf.h
index bc09d502..3b3d488b 100644
--- a/runtime/conf.h
+++ b/runtime/conf.h
@@ -33,21 +33,23 @@ extern int bConfStrictScoping; /* force strict scoping during config processing?
/* interfaces */
BEGINinterface(conf) /* name must also be changed in ENDinterface macro! */
- rsRetVal (*doNameLine)(uchar **pp, void* pVal);
- rsRetVal (*cfsysline)(uchar *p);
- rsRetVal (*doModLoad)(uchar **pp, __attribute__((unused)) void* pVal);
- rsRetVal (*doIncludeLine)(uchar **pp, __attribute__((unused)) void* pVal);
- rsRetVal (*cfline)(uchar *line, rule_t **pfCurr);
- rsRetVal (*processConfFile)(uchar *pConfFile);
- rsRetVal (*GetNbrActActions)(int *);
+ rsRetVal (*doNameLine)(rsconf_t *conf, uchar **pp, void* pVal);
+ rsRetVal (*cfsysline)(rsconf_t *conf, uchar *p);
+ rsRetVal (*doModLoad)(rsconf_t *conf, uchar **pp, __attribute__((unused)) void* pVal);
+ rsRetVal (*doIncludeLine)(rsconf_t *conf, uchar **pp, __attribute__((unused)) void* pVal);
+ rsRetVal (*cfline)(rsconf_t *conf, uchar *line, rule_t **pfCurr);
+ rsRetVal (*processConfFile)(rsconf_t *conf, uchar *pConfFile);
+ rsRetVal (*GetNbrActActions)(rsconf_t *conf, int *);
/* version 4 -- 2010-07-23 rgerhards */
/* "just" added global variables
* FYI: we reconsider repacking as a non-object, as only the core currently
* accesses this module. The current object structure complicates things without
* any real benefit.
*/
+ /* version 5 -- 2011-04-19 rgerhards */
+ /* complete revamp, we now use the rsconf object */
ENDinterface(conf)
-#define confCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */
+#define confCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */
/* in Version 3, entry point "ReInitConf()" was removed, as we do not longer need
* to support restart-type HUP -- rgerhards, 2009-07-15
*/