removing the newScope/resumeScope macro interfaces

to make using pre-v6-plugins even easier

4 files changed, 4 insertions, 16 deletions

diff --git a/runtime/conf.c b/runtime/conf.c
index 5118cdd9..7afc4f97 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -1286,8 +1286,7 @@ setActionScope(void)
 	/* now tell each action to start the scope */
 	pMod = NULL;
 	while((pMod = module.GetNxtType(pMod, eMOD_OUT)) != NULL) {
-		DBGPRINTF("beginning scope on module %s\n", pMod->pszName);
-		pMod->mod.om.newScope();
+		DBGPRINTF("NO LONGER SUPPORTED beginning scope on module %s\n", pMod->pszName);
 	}
 
 finalize_it:
@@ -1311,8 +1310,7 @@ unsetActionScope(void)
 	/* now tell each action to restore the scope */
 	pMod = NULL;
 	while((pMod = module.GetNxtType(pMod, eMOD_OUT)) != NULL) {
-		DBGPRINTF("exiting scope on module %s\n", pMod->pszName);
-		pMod->mod.om.restoreScope();
+		DBGPRINTF("NO LONGER SUPPORTED exiting scope on module %s\n", pMod->pszName);
 	}
 
 finalize_it:
diff --git a/runtime/module-template.h b/runtime/module-template.h
index 084d5d65..d7a869d4 100644
--- a/runtime/module-template.h
+++ b/runtime/module-template.h
@@ -327,14 +327,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)); \
@@ -414,10 +414,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 8ede134b..23b5c94e 100644
--- a/runtime/modules.c
+++ b/runtime/modules.c
@@ -469,8 +469,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)
@@ -624,8 +622,6 @@ static void modPrintList(void)
 			dbgprintf("\tparseSelectorAct:   0x%lx\n", (unsigned long) pMod->mod.om.parseSelectorAct);
 			dbgprintf("\ttryResume:          0x%lx\n", (unsigned long) pMod->tryResume);
 			dbgprintf("\tdoHUP:              0x%lx\n", (unsigned long) pMod->doHUP);
-			dbgprintf("\tnewScope:           0x%lx\n", (unsigned long) pMod->mod.om.newScope);
-			dbgprintf("\trestoreScope:       0x%lx\n", (unsigned long) pMod->mod.om.restoreScope);
 			dbgprintf("\tBeginTransaction:   0x%lx\n", (unsigned long)
 								   ((pMod->mod.om.beginTransaction == dummyBeginTransaction) ?
 								    0 :  pMod->mod.om.beginTransaction));
diff --git a/runtime/modules.h b/runtime/modules.h
index c1c38a26..75e993f1 100644
--- a/runtime/modules.h
+++ b/runtime/modules.h
@@ -133,8 +133,6 @@ struct modInfo_s {
 			rsRetVal (*doAction)(uchar**, unsigned, void*);
 			rsRetVal (*endTransaction)(void*);
 			rsRetVal (*parseSelectorAct)(uchar**, void**,omodStringRequest_t**);
-			rsRetVal (*newScope)(void);
-			rsRetVal (*restoreScope)(void);
 		} om;
 		struct { /* data for library modules */
 		    	char dummy;