diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:09:54 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:09:54 +0200 |
commit | a74898dc827ed4a8f9587196716746031b1e5169 (patch) | |
tree | fe6cc689c047b6fda7cad92dd8ff9a170af92873 /grammar/rainerscript.h | |
parent | d1589cd43978c700e2c88747e04d29c64a25d185 (diff) | |
parent | 3d56820f130e6c1b674560125e677be3b6a2d8f4 (diff) | |
download | rsyslog-a74898dc827ed4a8f9587196716746031b1e5169.tar.gz rsyslog-a74898dc827ed4a8f9587196716746031b1e5169.tar.xz rsyslog-a74898dc827ed4a8f9587196716746031b1e5169.zip |
Merge branch 'master-newtemplate'
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); |