milestone: make default modules compile again (but they do NOT work!)

9 files changed, 33 insertions, 2 deletions

diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c
index 11765507..2908095e 100644
--- a/plugins/omruleset/omruleset.c
+++ b/plugins/omruleset/omruleset.c
@@ -70,6 +70,10 @@ typedef struct _instanceData {
 	uchar *pszRulesetName;	/* primarily for debugging/display purposes */
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 typedef struct configSettings_s {
 	ruleset_t *pRuleset;	/* ruleset to enqueue message to (NULL = Default, not recommended) */
 	uchar *pszRulesetName;
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c
index c9f1e06b..7c793414 100644
--- a/plugins/omtesting/omtesting.c
+++ b/plugins/omtesting/omtesting.c
@@ -63,7 +63,6 @@ MODULE_CNFNAME("omtesting")
  */
 DEF_OMOD_STATIC_DATA
 
-
 typedef struct _instanceData {
 	enum { MD_SLEEP, MD_FAIL, MD_RANDFAIL, MD_ALWAYS_SUSPEND }
 		mode;
@@ -76,6 +75,10 @@ typedef struct _instanceData {
 	int	iCurrRetries;
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 typedef struct configSettings_s {
 	int bEchoStdout;	/* echo non-failed messages to stdout */
 } configSettings_t;
diff --git a/runtime/module-template.h b/runtime/module-template.h
index d1825f6a..a292711e 100644
--- a/runtime/module-template.h
+++ b/runtime/module-template.h
@@ -262,7 +262,7 @@ static rsRetVal endTransaction(instanceData __attribute__((unused)) *pData)\
 #define BEGINdoAction \
 static rsRetVal doAction(uchar __attribute__((unused)) **ppString, unsigned __attribute__((unused)) iMsgOpts, wrkrInstanceData_t __attribute__((unused)) *pWrkrData)\
 {\
-	instanceData pDate = NULL; /* deliberately make module abort if it does not support new IF */\
+	instanceData *pData = NULL; /* deliberately make module abort if it does not support new IF */\
 	DEFiRet;
 
 #define CODESTARTdoAction \
diff --git a/tools/omdiscard.c b/tools/omdiscard.c
index 15c6ea82..9bc3093a 100644
--- a/tools/omdiscard.c
+++ b/tools/omdiscard.c
@@ -49,6 +49,10 @@ typedef struct _instanceData {
 	EMPTY_STRUCT
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 /* we do not need a createInstance()!
 BEGINcreateInstance
 CODESTARTcreateInstance
diff --git a/tools/omfile.c b/tools/omfile.c
index fdcf355a..01d9cc5b 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -181,6 +181,10 @@ typedef struct _instanceData {
 	STATSCOUNTER_DEF(ctrMax, mutCtrMax);
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 
 typedef struct configSettings_s {
 	int iDynaFileCacheSize; /* max cache for dynamic files */
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 6e5cf809..b86c995c 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -112,6 +112,10 @@ typedef struct _instanceData {
 	int errsToReport;	/* (remaining) number of errors to report */
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 /* config data */
 typedef struct configSettings_s {
 	uchar *pszTplName; /* name of the default template to use */
diff --git a/tools/ompipe.c b/tools/ompipe.c
index df8066b1..6d44cd00 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -72,6 +72,10 @@ typedef struct _instanceData {
 	sbool	bHadError;	/* did we already have/report an error on this pipe? */
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 typedef struct configSettings_s {
 	EMPTY_STRUCT
 } configSettings_t;
diff --git a/tools/omshell.c b/tools/omshell.c
index ac62fa62..eb2d0a57 100644
--- a/tools/omshell.c
+++ b/tools/omshell.c
@@ -63,6 +63,10 @@ typedef struct _instanceData {
 	uchar	progName[MAXFNAME]; /* program  to execute */
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 BEGINcreateInstance
 CODESTARTcreateInstance
 ENDcreateInstance
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index f4cc4094..3a268fa5 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -87,6 +87,10 @@ typedef struct _instanceData {
 	uchar *tplName;
 } instanceData;
 
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
 typedef struct configSettings_s {
 	EMPTY_STRUCT
 } configSettings_t;