diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-13 13:15:15 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-13 13:15:15 +0100 |
| commit | dc760e8c672c2c896bc0d001fa1f7d9e02fe111c (patch) | |
| tree | 89609f09d667ab7db2f60139eb59524458a57f60 /plugins/mmutf8fix/mmutf8fix.c | |
| parent | 23278699e35173f46effda964fd80b8f868e8b3e (diff) | |
| parent | 45a4134a8b5c9111398be3458bd27b4aa2f0e5c2 (diff) | |
| download | rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.tar.gz rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.tar.bz2 rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.zip | |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Diffstat (limited to 'plugins/mmutf8fix/mmutf8fix.c')
| -rw-r--r-- | plugins/mmutf8fix/mmutf8fix.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/plugins/mmutf8fix/mmutf8fix.c b/plugins/mmutf8fix/mmutf8fix.c index e2077950..351bb129 100644 --- a/plugins/mmutf8fix/mmutf8fix.c +++ b/plugins/mmutf8fix/mmutf8fix.c @@ -60,6 +60,10 @@ typedef struct _instanceData { uint8_t mode; /* operations mode */ } instanceData; +typedef struct wrkrInstanceData { + instanceData *pData; +} wrkrInstanceData_t; + struct modConfData_s { rsconf_t *pConf; /* our overall config object */ }; @@ -108,6 +112,11 @@ CODESTARTcreateInstance ENDcreateInstance +BEGINcreateWrkrInstance +CODESTARTcreateWrkrInstance +ENDcreateWrkrInstance + + BEGINisCompatibleWithFeature CODESTARTisCompatibleWithFeature ENDisCompatibleWithFeature @@ -118,6 +127,11 @@ CODESTARTfreeInstance ENDfreeInstance +BEGINfreeWrkrInstance +CODESTARTfreeWrkrInstance +ENDfreeWrkrInstance + + static inline void setInstParamDefaults(instanceData *pData) { @@ -274,10 +288,10 @@ CODESTARTdoAction pMsg = (msg_t*) ppString[0]; lenMsg = getMSGLen(pMsg); msg = getMSG(pMsg); - if(pData->mode == MODE_CC) { - doCC(pData, msg, lenMsg); + if(pWrkrData->pData->mode == MODE_CC) { + doCC(pWrkrData->pData, msg, lenMsg); } else { - doUTF8(pData, msg, lenMsg); + doUTF8(pWrkrData->pData, msg, lenMsg); } ENDdoAction @@ -304,6 +318,7 @@ ENDmodExit BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_OMOD_QUERIES +CODEqueryEtryPt_STD_OMOD8_QUERIES CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES CODEqueryEtryPt_STD_CONF2_QUERIES ENDqueryEtryPt |