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 /runtime/msg.c | |
| 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 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 44d36fef..5fad8ea5 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2515,9 +2515,9 @@ jsonField(struct templateEntry *pTpe, uchar **ppRes, unsigned short *pbMustBeFre pSrc = *ppRes; buflen = (*pBufLen == -1) ? ustrlen(pSrc) : *pBufLen; /* we hope we have only few escapes... */ - dst = es_newStr(buflen+es_strlen(pTpe->data.field.fieldName)+15); + dst = es_newStr(buflen+es_strlen(pTpe->fieldName)+15); es_addChar(&dst, '"'); - es_addStr(&dst, pTpe->data.field.fieldName); + es_addStr(&dst, pTpe->fieldName); es_addBufConstcstr(&dst, "\":\""); CHKiRet(jsonAddVal(pSrc, buflen, &dst)); es_addChar(&dst, '"'); |