diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-03 17:16:10 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-03 17:16:10 +0100 |
| commit | 89667762cff9aca81f93f149bf1e853234074780 (patch) | |
| tree | a4b37910356619ac00aacc1a0922b29fdea1dbcd /runtime/obj.h | |
| parent | 8c32e9d36f1fc5476f4711905104970db345b3f9 (diff) | |
| parent | 5a643669221363a49fb36cfb2acc64dc29b53a14 (diff) | |
| download | rsyslog-89667762cff9aca81f93f149bf1e853234074780.tar.gz rsyslog-89667762cff9aca81f93f149bf1e853234074780.tar.bz2 rsyslog-89667762cff9aca81f93f149bf1e853234074780.zip | |
Merge branch 'master-newqueue'
Diffstat (limited to 'runtime/obj.h')
| -rw-r--r-- | runtime/obj.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/obj.h b/runtime/obj.h index 32f7ef09..a93befa3 100644 --- a/runtime/obj.h +++ b/runtime/obj.h @@ -83,10 +83,7 @@ ((obj_t*) (pThis))->pObjInfo = pObjInfoOBJ; \ ((obj_t*) (pThis))->pszName = NULL #endif -#define objDestruct(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_DESTRUCT])(&pThis) #define objSerialize(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_SERIALIZE]) -#define objGetSeverity(pThis, piSever) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_GETSEVERITY])(pThis, piSever) -#define objDebugPrint(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_DEBUGPRINT])(pThis) #define OBJSetMethodHandler(methodID, pHdlr) \ CHKiRet(obj.InfoSetMethod(pObjInfoOBJ, methodID, (rsRetVal (*)(void*)) pHdlr)) @@ -121,6 +118,7 @@ ENDinterface(obj) rsRetVal objGetObjInterface(obj_if_t *pIf); PROTOTYPEObjClassInit(obj); PROTOTYPEObjClassExit(obj); +rsRetVal objDeserializeWithMethods(void *ppObj, uchar *pszTypeExpected, strm_t *pStrm, rsRetVal (*fFixup)(obj_t*,void*), void *pUsr, rsRetVal (*objConstruct)(), rsRetVal (*objConstructFinalize)(), rsRetVal (*objSetProperty)()); /* the following definition is only for "friends" */ |