diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-27 16:25:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-27 16:25:53 +0200 |
| commit | a96e4966677d21e8bda6ed47b2ee72f565478562 (patch) | |
| tree | 485ddc0c5628cad7dbc13be0760a7a936216a63f /runtime/modules.h | |
| parent | 4cc23e9dc9e906e18539015081b2e5ad16b29417 (diff) | |
| parent | 53df5066688c8472a9f7be5c86bbc253378e6572 (diff) | |
| download | rsyslog-a96e4966677d21e8bda6ed47b2ee72f565478562.tar.gz rsyslog-a96e4966677d21e8bda6ed47b2ee72f565478562.tar.xz rsyslog-a96e4966677d21e8bda6ed47b2ee72f565478562.zip | |
Merge branch 'v6-devel'
Conflicts:
ChangeLog
action.c
grammar/grammar.y
runtime/modules.h
runtime/rsconf.c
Diffstat (limited to 'runtime/modules.h')
| -rw-r--r-- | runtime/modules.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/modules.h b/runtime/modules.h index 16425beb..e42d19e1 100644 --- a/runtime/modules.h +++ b/runtime/modules.h @@ -131,6 +131,7 @@ struct modInfo_s { /* TODO: remove? */rsRetVal (*willRun)(void); /* check if the current config will be able to run*/ rsRetVal (*runInput)(thrdInfo_t*); /* function to gather input and submit to queue */ rsRetVal (*afterRun)(thrdInfo_t*); /* function to gather input and submit to queue */ + rsRetVal (*newInpInst)(struct nvlst *lst); int bCanRun; /* cached value of whether willRun() succeeded */ } im; struct {/* data for output modules */ @@ -194,6 +195,6 @@ PROTOTYPEObj(module); */ rsRetVal modulesProcessCnf(struct cnfobj *o); uchar *modGetName(modInfo_t *pThis); - -rsRetVal addModToCnfList(modInfo_t *pThis); +rsRetVal addModToCnfList(cfgmodules_etry_t *pNew, cfgmodules_etry_t *pLast); +rsRetVal readyModForCnf(modInfo_t *pThis, cfgmodules_etry_t **ppNew, cfgmodules_etry_t **ppLast); #endif /* #ifndef MODULES_H_INCLUDED */ |