diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:16:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:16:25 +0200 |
| commit | 2a4e1c12f235d6914d650dd29d56df152b014209 (patch) | |
| tree | 3c9f7208c33deb589b2c329a9d9cb68d674680ae /grammar/rainerscript.h | |
| parent | 1f3d7e3a9d71d0c494db0de42709a700b34d786d (diff) | |
| parent | 2514bccdccaebe128055ffa0dc5132b4f4c48635 (diff) | |
| download | rsyslog-2a4e1c12f235d6914d650dd29d56df152b014209.tar.gz rsyslog-2a4e1c12f235d6914d650dd29d56df152b014209.tar.bz2 rsyslog-2a4e1c12f235d6914d650dd29d56df152b014209.zip | |
Merge branch 'master' into v7-devel
Conflicts:
runtime/msg.c
Diffstat (limited to 'grammar/rainerscript.h')
| -rw-r--r-- | grammar/rainerscript.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h index 5ff71bee..4c625cd8 100644 --- a/grammar/rainerscript.h +++ b/grammar/rainerscript.h @@ -16,6 +16,9 @@ enum cnfobjType { CNFOBJ_GLOBAL, CNFOBJ_INPUT, CNFOBJ_MODULE, + CNFOBJ_TPL, + CNFOBJ_PROPERTY, + CNFOBJ_CONSTANT, CNFOBJ_INVALID = 0 }; @@ -35,6 +38,15 @@ cnfobjType2str(enum cnfobjType ot) case CNFOBJ_MODULE: return "module"; break; + case CNFOBJ_TPL: + return "template"; + break; + case CNFOBJ_PROPERTY: + return "property"; + break; + case CNFOBJ_CONSTANT: + return "constant"; + break; default:return "error: invalid cnfobjType"; } } @@ -60,6 +72,12 @@ struct var { struct cnfobj { enum cnfobjType objType; struct nvlst *nvlst; + struct objlst *subobjs; +}; + +struct objlst { + struct objlst *next; + struct cnfobj *obj; }; struct nvlst { @@ -218,6 +236,9 @@ struct cnfparamvals { /* the values we obtained for param descr. */ int cnfParseBuffer(char *buf, unsigned lenBuf); void readConfFile(FILE *fp, es_str_t **str); +struct objlst* objlstNew(struct cnfobj *obj); +void objlstDestruct(struct objlst *lst); +void objlstPrint(struct objlst *lst); struct nvlst* nvlstNew(es_str_t *name, es_str_t *value); void nvlstDestruct(struct nvlst *lst); void nvlstPrint(struct nvlst *lst); |