diff options
| -rw-r--r-- | plugins/omtesting/omtesting.c | 2 | ||||
| -rw-r--r-- | runtime/module-template.h | 2 | ||||
| -rw-r--r-- | tools/omfile.c | 2 | ||||
| -rw-r--r-- | tools/omfwd.c | 4 | ||||
| -rw-r--r-- | tools/ompipe.c | 2 | ||||
| -rw-r--r-- | tools/omshell.c | 5 | ||||
| -rw-r--r-- | tools/omusrmsg.c | 2 |
7 files changed, 13 insertions, 6 deletions
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c index ffb1ff8b..d77f1df5 100644 --- a/plugins/omtesting/omtesting.c +++ b/plugins/omtesting/omtesting.c @@ -190,8 +190,10 @@ ENDtryResume BEGINdoAction + instanceData *pData; CODESTARTdoAction dbgprintf("omtesting received msg '%s'\n", ppString[0]); + pData = pWrkrData->pData; switch(pData->mode) { case MD_SLEEP: iRet = doSleep(pData); diff --git a/runtime/module-template.h b/runtime/module-template.h index c3e79570..f65aaf0f 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -249,7 +249,6 @@ static rsRetVal beginTransaction(wrkrInstanceData_t __attribute__((unused)) *pWr #define BEGINendTransaction \ static rsRetVal endTransaction(wrkrInstanceData_t __attribute__((unused)) *pWrkrData)\ {\ - instanceData *pData = NULL; /* deliberately make module abort if it does not support new IF */\ DEFiRet; #define CODESTARTendTransaction /* currently empty, but may be extended */ @@ -264,7 +263,6 @@ static rsRetVal endTransaction(wrkrInstanceData_t __attribute__((unused)) *pWrkr #define BEGINdoAction \ static rsRetVal doAction(uchar __attribute__((unused)) **ppString, unsigned __attribute__((unused)) iMsgOpts, wrkrInstanceData_t __attribute__((unused)) *pWrkrData)\ {\ - instanceData *pData = NULL; /* deliberately make module abort if it does not support new IF */\ DEFiRet; #define CODESTARTdoAction \ diff --git a/tools/omfile.c b/tools/omfile.c index e8cd24d3..90efe71a 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -1001,6 +1001,7 @@ dbgprintf("omfile: free write lock (pWrkrData %p)\n", pWrkrData); BEGINdoAction + instanceData *pData; CODESTARTdoAction pData = pWrkrData->pData; iRet = bufferLine(pWrkrData, (pData->bDynamicName) ? ppString[1] : pData->f_fname, @@ -1010,6 +1011,7 @@ CODESTARTdoAction ENDdoAction BEGINendTransaction + instanceData *pData; CODESTARTendTransaction pData = pWrkrData->pData; submitCachedLines(pWrkrData, pData); diff --git a/tools/omfwd.c b/tools/omfwd.c index a7ba4d01..01702043 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -751,7 +751,9 @@ BEGINdoAction # ifdef USE_NETZIP Bytef *out = NULL; /* for compression */ # endif + instanceData *pData; CODESTARTdoAction + pData = pWrkrData->pData; CHKiRet(doTryResume(pData)); iMaxLine = glbl.GetMaxLine(); @@ -827,7 +829,9 @@ ENDdoAction BEGINendTransaction + instanceData *pData; CODESTARTendTransaction + pData = pWrkrData->pData; dbgprintf("omfwd: endTransaction, offsSndBuf %u\n", pData->offsSndBuf); if(pData->offsSndBuf != 0) { iRet = TCPSendBuf(pData, pData->sndBuf, pData->offsSndBuf, IS_FLUSH); diff --git a/tools/ompipe.c b/tools/ompipe.c index 8d886509..79f3ae84 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -309,7 +309,9 @@ CODESTARTtryResume ENDtryResume BEGINdoAction + instanceData *pData; CODESTARTdoAction + pData = pWrkrData->pData; DBGPRINTF(" (%s)\n", pData->pipe); /* this module is single-threaded by nature */ pthread_mutex_lock(&pData->mutWrite); diff --git a/tools/omshell.c b/tools/omshell.c index a8ba1564..ad6e979f 100644 --- a/tools/omshell.c +++ b/tools/omshell.c @@ -106,10 +106,9 @@ ENDtryResume BEGINdoAction CODESTARTdoAction - pData = pWrkrData->pData; dbgprintf("\n"); - if(execProg((uchar*) pData->progName, 1, ppString[0]) == 0) - errmsg.LogError(0, NO_ERRCODE, "Executing program '%s' failed", (char*)pData->progName); + if(execProg((uchar*) pWrkrData->pData->progName, 1, ppString[0]) == 0) + errmsg.LogError(0, NO_ERRCODE, "Executing program '%s' failed", (char*)pWrkrData->pData->progName); ENDdoAction diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index cab2a4fe..5d0b088f 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -290,7 +290,7 @@ ENDtryResume BEGINdoAction CODESTARTdoAction dbgprintf("\n"); - iRet = wallmsg(ppString[0], pData); + iRet = wallmsg(ppString[0], pWrkrData->pData); ENDdoAction |