diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:27:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:27:06 +0200 |
| commit | 27a0078958d808a323c945b58b77ee96ee690444 (patch) | |
| tree | 2bcd479d0e5b42dd92c715e917722d6519c922b0 /runtime/msg.c | |
| parent | 1eac94e11dab1e7caead5e31a57d2cae31b5ad62 (diff) | |
| parent | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (diff) | |
| download | rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.gz rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.xz rsyslog-27a0078958d808a323c945b58b77ee96ee690444.zip | |
Merge branch 'master' into master-newtemplate
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 99874317..da751dba 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2814,11 +2814,13 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, ++pFld; /* skip to field terminator */ if(*pFld == pTpe->data.field.field_delim) { ++pFld; /* eat it */ +#ifdef STRICT_GPLV3 if (pTpe->data.field.field_expand != 0) { while (*pFld == pTpe->data.field.field_delim) { ++pFld; } } +#endif ++iCurrFld; } } |