Merge branch 'v6-stable'

Conflicts:
	runtime/conf.c
	runtime/modules.c
	runtime/modules.h

4 files changed, 4 insertions, 16 deletions

diff --git a/runtime/conf.c b/runtime/conf.c
index 2e21f3cb..7849598e 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -830,8 +830,7 @@ setActionScope(void)
 	/* now tell each action to start the scope */
 	node = NULL;
 	while((node = module.GetNxtCnfType(loadConf, node, eMOD_OUT)) != NULL) {
-		DBGPRINTF("beginning scope on module %s\n", node->pMod->pszName);
-		node->pMod->mod.om.newScope();
+		DBGPRINTF("NO LONGER SUPPORTED beginning scope on module %s\n", node->pMod->pszName);
 	}
 
 finalize_it:
@@ -855,8 +854,7 @@ unsetActionScope(void)
 	/* now tell each action to restore the scope */
 	node = NULL;
 	while((node = module.GetNxtCnfType(loadConf, node, eMOD_OUT)) != NULL) {
-		DBGPRINTF("exiting scope on module %s\n", node->pMod->pszName);
-		node->pMod->mod.om.restoreScope();
+		DBGPRINTF("NO LONGER SUPPORTED exiting scope on module %s\n", node->pMod->pszName);
 	}
 
 finalize_it:
diff --git a/runtime/module-template.h b/runtime/module-template.h
index a50b1fe9..b98890ae 100644
--- a/runtime/module-template.h
+++ b/runtime/module-template.h
@@ -386,14 +386,14 @@ static rsRetVal tryResume(instanceData __attribute__((unused)) *pData)\
 static rsRetVal initConfVars(void);\
 static configSettings_t cs;				/* our current config settings */ \
 static configSettings_t cs_save;			/* our saved (scope!) config settings */ \
-static rsRetVal newScope(void) \
+static rsRetVal __attribute__((unused)) newScope(void) \
 { \
 	DEFiRet; \
 	memcpy(&cs_save, &cs, sizeof(cs)); \
 	iRet = initConfVars(); \
 	RETiRet; \
 } \
-static rsRetVal restoreScope(void) \
+static rsRetVal __attribute__((unused)) restoreScope(void) \
 { \
 	DEFiRet; \
 	memcpy(&cs, &cs_save, sizeof(cs)); \
@@ -473,10 +473,6 @@ static rsRetVal queryEtryPt(uchar *name, rsRetVal (**pEtryPoint)())\
 		*pEtryPoint = freeInstance;\
 	} else if(!strcmp((char*) name, "parseSelectorAct")) {\
 		*pEtryPoint = parseSelectorAct;\
-	} else if(!strcmp((char*) name, "newScope")) {\
-		*pEtryPoint = newScope;\
-	} else if(!strcmp((char*) name, "restoreScope")) {\
-		*pEtryPoint = restoreScope;\
 	} else if(!strcmp((char*) name, "isCompatibleWithFeature")) {\
 		*pEtryPoint = isCompatibleWithFeature;\
 	} else if(!strcmp((char*) name, "tryResume")) {\
diff --git a/runtime/modules.c b/runtime/modules.c
index e5475780..5a87c8be 100644
--- a/runtime/modules.c
+++ b/runtime/modules.c
@@ -599,8 +599,6 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"doAction", &pNew->mod.om.doAction));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"parseSelectorAct", &pNew->mod.om.parseSelectorAct));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"tryResume", &pNew->tryResume));
-			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"newScope", &pNew->mod.om.newScope));
-			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"restoreScope", &pNew->mod.om.restoreScope));
 			/* try load optional interfaces */
 			localRet = (*pNew->modQueryEtryPt)((uchar*)"doHUP", &pNew->doHUP);
 			if(localRet != RS_RET_OK && localRet != RS_RET_MODULE_ENTRY_POINT_NOT_FOUND)
@@ -777,8 +775,6 @@ static void modPrintList(void)
 								    NULL :  pMod->mod.om.newActInst);
 			dbgprintf("\ttryResume:          %p\n", pMod->tryResume);
 			dbgprintf("\tdoHUP:              %p\n", pMod->doHUP);
-			dbgprintf("\tnewScope:           %p\n", pMod->mod.om.newScope);
-			dbgprintf("\trestoreScope:       %p\n", pMod->mod.om.restoreScope);
 			dbgprintf("\tBeginTransaction:   %p\n", ((pMod->mod.om.beginTransaction == dummyBeginTransaction) ?
 								   NULL :  pMod->mod.om.beginTransaction));
 			dbgprintf("\tEndTransaction:     %p\n", ((pMod->mod.om.endTransaction == dummyEndTransaction) ?
diff --git a/runtime/modules.h b/runtime/modules.h
index 4956dd4a..6c5a2cba 100644
--- a/runtime/modules.h
+++ b/runtime/modules.h
@@ -138,8 +138,6 @@ struct modInfo_s {
 			rsRetVal (*doAction)(uchar**, unsigned, void*);
 			rsRetVal (*endTransaction)(void*);
 			rsRetVal (*parseSelectorAct)(uchar**, void**,omodStringRequest_t**);
-			rsRetVal (*newScope)(void);
-			rsRetVal (*restoreScope)(void);
 			rsRetVal (*newActInst)(uchar *modName, struct nvlst *lst, void **, omodStringRequest_t **);
 		} om;
 		struct { /* data for library modules */