diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-10 16:49:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-10 16:49:14 +0200 |
| commit | 6f4e3c4e4c85acdcf58969970484a54639ecc8f9 (patch) | |
| tree | 1e3470e4ac9738c7713f1ef1a0558ed881457d44 /runtime/obj-types.h | |
| parent | 9704f129f72ec9ece11aeccea4bbf0cbccb116cb (diff) | |
| download | rsyslog-6f4e3c4e4c85acdcf58969970484a54639ecc8f9.tar.gz rsyslog-6f4e3c4e4c85acdcf58969970484a54639ecc8f9.tar.xz rsyslog-6f4e3c4e4c85acdcf58969970484a54639ecc8f9.zip | |
restructered code in perparation for multiple rule set support
... this was long overdue, and I finlly tackeld it. It turned out to
be more complex than I initially thought. The next step now probably is
to actually implement multiple rule sets and the beauty that comes
with them.
Diffstat (limited to 'runtime/obj-types.h')
| -rw-r--r-- | runtime/obj-types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/obj-types.h b/runtime/obj-types.h index 914c2f2c..23f74590 100644 --- a/runtime/obj-types.h +++ b/runtime/obj-types.h @@ -105,12 +105,13 @@ struct obj_s { /* the dummy struct that each derived class can be casted to */ # define ISOBJ_TYPE_assert(pObj, objType) \ do { \ ASSERT(pObj != NULL); \ - ASSERT((unsigned) ((obj_t*) (pObj))->iObjCooCKiE == (unsigned) 0xBADEFEE); \ if(strcmp((char*)(((obj_t*)pObj)->pObjInfo->pszID), #objType)) { \ dbgprintf("%s:%d ISOBJ assert failure: invalid object type, expected '%s' " \ - "actual '%s'\n", __FILE__, __LINE__, #objType, (((obj_t*)pObj)->pObjInfo->pszID)); \ + "actual '%s', cookie: %X\n", __FILE__, __LINE__, #objType, \ + (((obj_t*)pObj)->pObjInfo->pszID), ((obj_t*)(pObj))->iObjCooCKiE); \ assert(0); /* trigger assertion, messge we already have */ \ } \ + ASSERT((unsigned) ((obj_t*)(pObj))->iObjCooCKiE == (unsigned) 0xBADEFEE); \ } while(0) #else /* non-debug mode, no checks but much faster */ # define BEGINobjInstance obj_t objData |