diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 13:20:55 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 13:20:55 +0100 |
| commit | bcc3b2aef74534cebc39f1351927756d144a7942 (patch) | |
| tree | 9c182438089a48f4653be0a34cc6105348d26dfb /runtime/ctok.c | |
| parent | b9cc60deeb0201e263ee011a20b0bce4eb6001f4 (diff) | |
| parent | 68c13f3f6a691c7f854e6fa4caff43295896dbde (diff) | |
| download | rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.gz rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.xz rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
runtime/glbl.c
Diffstat (limited to 'runtime/ctok.c')
| -rw-r--r-- | runtime/ctok.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/ctok.c b/runtime/ctok.c index 6d97568e..19c9bd24 100644 --- a/runtime/ctok.c +++ b/runtime/ctok.c @@ -1,4 +1,4 @@ -/* cfgtok.c - helper class to tokenize an input stream - which surprisingly +/* ctok.c - helper class to tokenize an input stream - which surprisingly * currently does not work with streams but with string. But that will * probably change over time ;) This class was originally written to support * the expression module but may evolve when (if) the expression module is @@ -267,7 +267,7 @@ ctokGetVar(ctok_t *pThis, ctok_token_t *pToken) { DEFiRet; uchar c; - cstr_t *pstrVal; + cstr_t *pstrVal = NULL; ISOBJ_TYPE_assert(pThis, ctok); ASSERT(pToken != NULL); |