diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
| commit | 4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21 (patch) | |
| tree | 70b8123a9d7d648fe007e8f6c01466e9b26fd4e1 /runtime/ctok.c | |
| parent | c4c20c18aae7c95c1e69c10d2ea9efbc3c2c1913 (diff) | |
| parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
| download | rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.gz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.bz2 rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
runtime/parser.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 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); |