v6.1/2 scoping support removed from plugins

6 files changed, 10 insertions, 25 deletions

diff --git a/tools/omdiscard.c b/tools/omdiscard.c
index 5b64d3ff..182c4b63 100644
--- a/tools/omdiscard.c
+++ b/tools/omdiscard.c
@@ -47,16 +47,6 @@ typedef struct _instanceData {
 	EMPTY_STRUCT
 } instanceData;
 
-typedef struct configSettings_s {
-	EMPTY_STRUCT
-} configSettings_t;
-
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
-
-BEGINinitConfVars		/* (re)set config variables to default values */
-CODESTARTinitConfVars 
-ENDinitConfVars
-
 /* we do not need a createInstance()!
 BEGINcreateInstance
 CODESTARTcreateInstance
@@ -124,7 +114,6 @@ ENDqueryEtryPt
 
 BEGINmodInit(Discard)
 CODESTARTmodInit
-SCOPINGmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 ENDmodInit
diff --git a/tools/omfile.c b/tools/omfile.c
index e618b817..c7f1b896 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -177,10 +177,9 @@ typedef struct configSettings_s {
 	int	bUseAsyncWriter;	/* should we enable asynchronous writing? */
 	EMPTY_STRUCT
 } configSettings_t;
+static configSettings_t cs;
 uchar	*pszFileDfltTplName; /* name of the default template to use */
 
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
-
 /* tables for interfacing with the v6 config system */
 /* action (instance) parameters */
 static struct cnfparamdescr actpdescr[] = {
@@ -1010,7 +1009,7 @@ BEGINmodInit(File)
 CODESTARTmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
-SCOPINGmodInit
+INITLegCnfVars
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 	CHKiRet(objUse(strm, CORE_COMPONENT));
 
diff --git a/tools/omfwd.c b/tools/omfwd.c
index da8f9e22..96458941 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -112,8 +112,7 @@ typedef struct configSettings_s {
 	int iUDPRebindInterval;	/* support for automatic re-binding (load balancers!). 0 - no rebind */
 	permittedPeers_t *pPermPeers;
 } configSettings_t;
-
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
+static configSettings_t cs;
 
 /* tables for interfacing with the v6 config system */
 /* action (instance) parameters */
@@ -987,7 +986,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 
 BEGINmodInit(Fwd)
 CODESTARTmodInit
-SCOPINGmodInit
+INITLegCnfVars
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(glbl, CORE_COMPONENT));
diff --git a/tools/ompipe.c b/tools/ompipe.c
index 7400bb18..1eb0dbce 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -78,8 +78,7 @@ typedef struct _instanceData {
 typedef struct configSettings_s {
 	EMPTY_STRUCT
 } configSettings_t;
-
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
+static configSettings_t cs;
 
 BEGINinitConfVars		/* (re)set config variables to default values */
 CODESTARTinitConfVars 
@@ -250,7 +249,7 @@ ENDqueryEtryPt
 
 BEGINmodInit(Pipe)
 CODESTARTmodInit
-SCOPINGmodInit
+INITLegCnfVars
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
diff --git a/tools/omshell.c b/tools/omshell.c
index 648d28a4..130d89d8 100644
--- a/tools/omshell.c
+++ b/tools/omshell.c
@@ -60,8 +60,7 @@ typedef struct _instanceData {
 typedef struct configSettings_s {
 	EMPTY_STRUCT	/* remove this when data members are added */
 } configSettings_t;
-
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
+static configSettings_t cs;
 
 BEGINinitConfVars		/* (re)set config variables to default values */
 CODESTARTinitConfVars 
@@ -148,7 +147,7 @@ ENDqueryEtryPt
 
 BEGINmodInit(Shell)
 CODESTARTmodInit
-SCOPINGmodInit
+INITLegCnfVars
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index 6d6b267a..f8e40594 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -91,7 +91,7 @@ typedef struct configSettings_s {
 	EMPTY_STRUCT
 } configSettings_t;
 
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
+static configSettings_t cs;
 
 
 /* tables for interfacing with the v6 config system */
@@ -442,7 +442,7 @@ ENDqueryEtryPt
 
 BEGINmodInit(UsrMsg)
 CODESTARTmodInit
-SCOPINGmodInit
+INITLegCnfVars
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));