omshell: use new errmsg interface

see also https://github.com/rsyslog/rsyslog/issues/1684
This commit is contained in:
Jan Gerhards 2018-04-16 19:22:16 +02:00
parent c3fb6e07e2
commit 2100326e43

View File

@ -57,7 +57,6 @@ MODULE_TYPE_NOKEEP
/* internal structures /* internal structures
*/ */
DEF_OMOD_STATIC_DATA DEF_OMOD_STATIC_DATA
DEFobjCurrIf(errmsg)
typedef struct _instanceData { typedef struct _instanceData {
uchar progName[MAXFNAME]; /* program to execute */ uchar progName[MAXFNAME]; /* program to execute */
@ -108,7 +107,7 @@ BEGINdoAction
CODESTARTdoAction CODESTARTdoAction
dbgprintf("\n"); dbgprintf("\n");
if(execProg((uchar*) pWrkrData->pData->progName, 1, ppString[0]) == 0) if(execProg((uchar*) pWrkrData->pData->progName, 1, ppString[0]) == 0)
errmsg.LogError(0, NO_ERRCODE, "Executing program '%s' failed", (char*)pWrkrData->pData->progName); LogError(0, NO_ERRCODE, "Executing program '%s' failed", (char*)pWrkrData->pData->progName);
ENDdoAction ENDdoAction
@ -157,7 +156,6 @@ BEGINmodInit(Shell)
CODESTARTmodInit CODESTARTmodInit
*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
CODEmodInit_QueryRegCFSLineHdlr CODEmodInit_QueryRegCFSLineHdlr
CHKiRet(objUse(errmsg, CORE_COMPONENT));
ENDmodInit ENDmodInit
/* /*