diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2007-08-03 10:07:38 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2007-08-03 10:07:38 +0000 |
| commit | adbf55ece666c71e882c370a74efa0bbf3239226 (patch) | |
| tree | e95a9c8927460313b02141ed3d66f9d672c717cc /module-template.h | |
| parent | e0414c4b9ed88a39e08870030c673bec9a3f1d4b (diff) | |
| download | rsyslog-adbf55ece666c71e882c370a74efa0bbf3239226.tar.gz rsyslog-adbf55ece666c71e882c370a74efa0bbf3239226.tar.xz rsyslog-adbf55ece666c71e882c370a74efa0bbf3239226.zip | |
- added CODE_STD_FINALIZERparseSelectorAct to module-generation macros
- restructered rsyslogd startup - moved startWorker() to a more appropriate
place
- updated ommysql.c to fully support suspension/resumption by rule engine
Diffstat (limited to 'module-template.h')
| -rw-r--r-- | module-template.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/module-template.h b/module-template.h index 2ef4a174..54f18cfa 100644 --- a/module-template.h +++ b/module-template.h @@ -217,12 +217,11 @@ static rsRetVal parseSelectorAct(uchar **pp, void **ppModData, omodStringRequest p = *pp; #define CODE_STD_STRING_REQUESTparseSelectorAct(NumStrReqEntries) \ - if((iRet = OMSRconstruct(ppOMSR, NumStrReqEntries)) != RS_RET_OK)\ - goto do_abort;\ + CHKiRet(OMSRconstruct(ppOMSR, NumStrReqEntries)); -#define ENDparseSelectorAct \ -do_abort:\ - if(iRet == RS_RET_OK) {\ +#define CODE_STD_FINALIZERparseSelectorAct \ +finalize_it:\ + if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) {\ *ppModData = pData;\ *pp = p;\ } else {\ @@ -230,7 +229,9 @@ do_abort:\ if(*ppOMSR != NULL)\ OMSRdestruct(*ppOMSR);\ *ppOMSR = NULL;\ - }\ + } + +#define ENDparseSelectorAct \ return iRet;\ } |