summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2012-08-11 05:58:15 +0200
committerMiloslav Trmač <mitr@redhat.com>2012-08-28 10:26:42 +0200
commit67039f21b40f711b2462b022b8c508af75ef3dcb (patch)
tree7ed9feabb18844ced920f82ee4921ce76d98f3bd /runtime
parent2514bccdccaebe128055ffa0dc5132b4f4c48635 (diff)
downloadrsyslog-67039f21b40f711b2462b022b8c508af75ef3dcb.tar.gz
rsyslog-67039f21b40f711b2462b022b8c508af75ef3dcb.tar.xz
rsyslog-67039f21b40f711b2462b022b8c508af75ef3dcb.zip
Add OMSR_TPL_AS_FIELDS mode for output modules.
This does not yet do anything. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'runtime')
-rw-r--r--runtime/objomsr.c3
-rw-r--r--runtime/objomsr.h7
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/objomsr.c b/runtime/objomsr.c
index 7241fa27..b95fc219 100644
--- a/runtime/objomsr.c
+++ b/runtime/objomsr.c
@@ -149,7 +149,8 @@ OMSRgetSupportedTplOpts(unsigned long *pOpts)
{
DEFiRet;
assert(pOpts != NULL);
- *pOpts = OMSR_RQD_TPL_OPT_SQL | OMSR_TPL_AS_ARRAY | OMSR_TPL_AS_MSG;
+ *pOpts = (OMSR_RQD_TPL_OPT_SQL | OMSR_TPL_AS_ARRAY | OMSR_TPL_AS_MSG
+ | OMSR_TPL_AS_FIELDS);
RETiRet;
}
diff --git a/runtime/objomsr.h b/runtime/objomsr.h
index 643e02c5..912ac0ae 100644
--- a/runtime/objomsr.h
+++ b/runtime/objomsr.h
@@ -25,12 +25,13 @@
/* define flags for required template options */
#define OMSR_NO_RQD_TPL_OPTS 0
#define OMSR_RQD_TPL_OPT_SQL 1
-/* only one of OMSR_TPL_AS_ARRAY or _AS_MSG must be specified, if both are given
- * results are unpredictable.
+/* only one of OMSR_TPL_AS_ARRAY, _AS_MSG or _AS_FIELDS must be specified, if
+ * both are given results are unpredictable.
*/
#define OMSR_TPL_AS_ARRAY 2 /* introduced in 4.1.6, 2009-04-03 */
#define OMSR_TPL_AS_MSG 4 /* introduced in 5.3.4, 2009-11-02 */
-/* next option is 8, 16, 32, ... */
+#define OMSR_TPL_AS_FIELDS 8 /* introduced in 6.3.13, 2012-08-11 */
+/* next option is 16, 32, ... */
struct omodStringRequest_s { /* strings requested by output module for doAction() */
int iNumEntries; /* number of array entries for data elements below */