diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-29 16:08:23 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-29 16:08:23 +0000 |
commit | 5f8b43e12ae8e42e1cb9eed7692f6f53ea279ff8 (patch) | |
tree | 231316d309313fdffad1f5452bf6c412d8776190 | |
parent | a7eb97b930bbbd3133f336a6f2ccbfb55eebbcfb (diff) | |
download | rsyslog-5f8b43e12ae8e42e1cb9eed7692f6f53ea279ff8.tar.gz rsyslog-5f8b43e12ae8e42e1cb9eed7692f6f53ea279ff8.tar.xz rsyslog-5f8b43e12ae8e42e1cb9eed7692f6f53ea279ff8.zip |
corrected invalid function definition
-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*)); |