diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-04 16:23:37 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-04 16:23:37 +0000 |
| commit | eb9f97ee2d34f00ca823ebead26e133e4b9a8495 (patch) | |
| tree | ed1ed4bf41246d80c4347336eaa2b250ae5c6eed /obj.h | |
| parent | faf8e5a3849621acfbd0a0887f2e924a40cb029a (diff) | |
| download | rsyslog-eb9f97ee2d34f00ca823ebead26e133e4b9a8495.tar.gz rsyslog-eb9f97ee2d34f00ca823ebead26e133e4b9a8495.tar.xz rsyslog-eb9f97ee2d34f00ca823ebead26e133e4b9a8495.zip | |
removed serialization pointer from queue; used new base class instead
Diffstat (limited to 'obj.h')
| -rw-r--r-- | obj.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -44,7 +44,7 @@ typedef enum { /* IDs of base methods supported by all objects - used for jump t typedef struct objInfo_s { objID_t objID; uchar *pszName; - rsRetVal (*objMethods[OBJ_NUM_METHODS])(void *pThis); + rsRetVal (*objMethods[OBJ_NUM_METHODS])(); } objInfo_t; typedef struct obj { /* the dummy struct that each derived class can be casted to */ @@ -57,7 +57,8 @@ typedef struct obj { /* the dummy struct that each derived class can be casted t #define BEGINobjInstance objInfo_t *pObjInfo /* must be called in Constructor: */ #define objConstructSetObjInfo(pThis) ((obj_t*) (pThis))->pObjInfo = pObjInfoOBJ; -#define objDestruct(pThis) ((objInfo_t*) (pThis)->objMethods[objMethod_DESTRUCT]) +#define objDestruct(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_DESTRUCT]) +#define objSerialize(pThis) (((obj_t*) (pThis))->pObjInfo->objMethods[objMethod_SERIALIZE]) /* class initializer */ #define PROTOTYPEObjClassInit(objName) rsRetVal objName##ClassInit(void) #define BEGINObjClassInit(objName) \ |