diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:21:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:21:26 +0200 |
| commit | 1824ab8d98b983402315b86954a7ad160b43b508 (patch) | |
| tree | adfb7827dd31d4bc11687cfabcd218dc53edfee2 /runtime/msg.c | |
| parent | d7f26ff418237415834f5c34d10de120e16dc721 (diff) | |
| download | rsyslog-1824ab8d98b983402315b86954a7ad160b43b508.tar.gz rsyslog-1824ab8d98b983402315b86954a7ad160b43b508.tar.xz rsyslog-1824ab8d98b983402315b86954a7ad160b43b508.zip | |
change template.[ch] to ASL 2.0, removing a GPLv3-only patch
see template.c file header for details
Note that this functionality was almost never used in practice
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 f9acb842..0d22b29a 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2547,11 +2547,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; } } |