diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 12:21:10 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 12:21:10 +0100 |
| commit | 75bfef7fa1c9f71232a282aa66e52b2d1860100a (patch) | |
| tree | 9cc622a55341f7fc7b0185965db2354704df0407 /runtime | |
| parent | d2dc913edc7bc4e0880f4dd6eb4aff495adb8138 (diff) | |
| parent | ec6230cffe6e06957113d53272d00dc859a3e617 (diff) | |
| download | rsyslog-75bfef7fa1c9f71232a282aa66e52b2d1860100a.tar.gz rsyslog-75bfef7fa1c9f71232a282aa66e52b2d1860100a.tar.xz rsyslog-75bfef7fa1c9f71232a282aa66e52b2d1860100a.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 2 | ||||
| -rw-r--r-- | runtime/ctok.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index e2d3a889..bbd2147a 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1084,7 +1084,7 @@ static rsRetVal cflineDoAction(uchar **p, action_t **ppAction) DEFiRet; modInfo_t *pMod; omodStringRequest_t *pOMSR; - action_t *pAction; + action_t *pAction = NULL; void *pModData; ASSERT(p != NULL); 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); |