diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
| commit | d3da845a61129c256c3e96fe144ea1dd67bac7c6 (patch) | |
| tree | dd33fccce6c88b0225c609c382bd6c0c211173ae /runtime/ctok.c | |
| parent | da75472096c45dd136d41c6e9ad7bf740069d3a1 (diff) | |
| parent | 2181515805e65c37b9db5e0badef2a0a86164234 (diff) | |
| download | rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.gz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.xz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 18ddaed2..99b0e095 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); |