diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-30 18:22:03 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-30 18:22:03 +0100 |
| commit | 2f5aec47dba3ba34e600be3c89dcce47ee2ff7bd (patch) | |
| tree | ae40abbd92646090ca5af8f28c3f0827fc39d319 | |
| parent | 63edb11d370c65fc7b203e0968735fb38fc6acde (diff) | |
| download | rsyslog-2f5aec47dba3ba34e600be3c89dcce47ee2ff7bd.tar.gz rsyslog-2f5aec47dba3ba34e600be3c89dcce47ee2ff7bd.tar.bz2 rsyslog-2f5aec47dba3ba34e600be3c89dcce47ee2ff7bd.zip | |
remove pData from tryResume callback
| -rw-r--r-- | plugins/omtesting/omtesting.c | 4 | ||||
| -rw-r--r-- | runtime/module-template.h | 3 | ||||
| -rw-r--r-- | tools/omfwd.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c index 7c793414..ffb1ff8b 100644 --- a/plugins/omtesting/omtesting.c +++ b/plugins/omtesting/omtesting.c @@ -173,11 +173,11 @@ static rsRetVal doRandFail(void) BEGINtryResume CODESTARTtryResume dbgprintf("omtesting tryResume() called\n"); - switch(pData->mode) { + switch(pWrkrData->pData->mode) { case MD_SLEEP: break; case MD_FAIL: - iRet = doFailOnResume(pData); + iRet = doFailOnResume(pWrkrData->pData); break; case MD_RANDFAIL: iRet = doRandFail(); diff --git a/runtime/module-template.h b/runtime/module-template.h index f23f4348..c3e79570 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -424,11 +424,10 @@ static rsRetVal newInpInst(struct nvlst *lst)\ #define BEGINtryResume \ static rsRetVal tryResume(wrkrInstanceData_t __attribute__((unused)) *pWrkrData)\ {\ - instanceData *pData = pWrkrData->pData; \ DEFiRet; #define CODESTARTtryResume \ - assert(pData != NULL); + assert(pWrkrData != NULL); #define ENDtryResume \ RETiRet;\ diff --git a/tools/omfwd.c b/tools/omfwd.c index ca33cac2..a7ba4d01 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -734,7 +734,7 @@ finalize_it: BEGINtryResume CODESTARTtryResume - iRet = doTryResume(pData); + iRet = doTryResume(pWrkrData->pData); ENDtryResume |