diff options
-rw-r--r-- | conf.c | 5 | ||||
-rw-r--r-- | obj.c | 2 | ||||
-rw-r--r-- | obj.h | 2 |
3 files changed, 2 insertions, 7 deletions
@@ -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; @@ -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; @@ -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*)); |