corrected invalid function definition

3 files changed, 2 insertions, 7 deletions

diff --git a/conf.c b/conf.c
index 9ac85d34..115224f6 100644
--- a/conf.c
+++ b/conf.c
@@ -58,9 +58,6 @@
 DEFobjCurrIf(obj)
 DEFobjCurrIf(expr)
 DEFobjCurrIf(ctok)
-#include "vm.h"
-DEFobjCurrIf(vm) // TODO: remove, testing aid! rgerhards, 2008-02-25
-DEFobjCurrIf(var) // TODO: remove, testing aid! rgerhards, 2008-02-25
 
 uchar	*pModDir = NULL; /* read-only after startup */
 
@@ -1186,8 +1183,6 @@ rsRetVal confClassInit(void)
 	CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */
 	CHKiRet(objUse(expr, CORE_COMPONENT));
 	CHKiRet(objUse(ctok, CORE_COMPONENT));
-	CHKiRet(objUse(vm, CORE_COMPONENT)); // TODO: remove, testing aid! rgerhards, 2008-02-25
-	CHKiRet(objUse(var, CORE_COMPONENT)); // TODO: remove, testing aid! rgerhards, 2008-02-25
 
 finalize_it:
 	RETiRet;
diff --git a/obj.c b/obj.c
index cd28a3e2..0680c32b 100644
--- a/obj.c
+++ b/obj.c
@@ -1044,7 +1044,7 @@ finalize_it:
  * rgerhards, 2008-02-29
  */
 static rsRetVal
-UseObj(uchar *pObjName, uchar *pObjFile, interface_t **ppIf)
+UseObj(uchar *pObjName, uchar *pObjFile, interface_t *ppIf)
 {
 	DEFiRet;
 	cstr_t *pStr = NULL;
diff --git a/obj.h b/obj.h
index 4cce9d02..6b9f7df4 100644
--- a/obj.h
+++ b/obj.h
@@ -92,7 +92,7 @@
 
 /* interfaces */
 BEGINinterface(obj) /* name must also be changed in ENDinterface macro! */
-	rsRetVal (*UseObj)(uchar *pObjName, uchar *pObjFile, interface_t **ppIf);
+	rsRetVal (*UseObj)(uchar *pObjName, uchar *pObjFile, interface_t *ppIf);
 	rsRetVal (*InfoConstruct)(objInfo_t **ppThis, uchar *pszID, int iObjVers,
 		                  rsRetVal (*pConstruct)(void *), rsRetVal (*pDestruct)(void *),
 	      			  rsRetVal (*pQueryIF)(interface_t*));