diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-16 13:31:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-16 13:31:21 +0200 |
| commit | 6dea3e91041963e90f53dae0ec1ffca7e283332c (patch) | |
| tree | d3ef511caab83d7f148f27c19c0e2313a4e6d782 /grammar/rainerscript.h | |
| parent | ffa4f08b98d6a8b820b082e4504a4ede495675ca (diff) | |
| parent | 620d0448171378748495f495b6db7b67686cdf49 (diff) | |
| download | rsyslog-6dea3e91041963e90f53dae0ec1ffca7e283332c.tar.gz rsyslog-6dea3e91041963e90f53dae0ec1ffca7e283332c.tar.bz2 rsyslog-6dea3e91041963e90f53dae0ec1ffca7e283332c.zip | |
Merge branch 'master-var-refactor' into tmp
Diffstat (limited to 'grammar/rainerscript.h')
| -rw-r--r-- | grammar/rainerscript.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h index 4a508f93..001dff4e 100644 --- a/grammar/rainerscript.h +++ b/grammar/rainerscript.h @@ -6,7 +6,6 @@ #include <sys/types.h> #include <regex.h> - #define LOG_NFACILITIES 24 /* current number of syslog facilities */ #define CNFFUNC_MAX_ARGS 32 /**< maximum number of arguments that any function can have (among @@ -182,8 +181,7 @@ struct cnfstmt { regex_t *regex_cache;/* cache for compiled REs, if used */ struct cstr_s *pCSCompValue;/* value to "compare" against */ sbool isNegated; - uintTiny propID;/* ID of the requested property */ - es_str_t *propName;/* name of property for CEE-based filters */ + msgPropDescr_t prop; /* requested property */ struct cnfstmt *t_then; struct cnfstmt *t_else; } s_propfilt; @@ -210,6 +208,7 @@ struct cnfstringval { struct cnfvar { unsigned nodetype; char *name; + msgPropDescr_t prop; }; struct cnfarray { |