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 /tools/syslogd.c | |
| 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 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index e347794b..a2ce6469 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -514,10 +514,10 @@ preprocessBatch(batch_t *pBatch) { DEFiRet; bSingleRuleset = 1; - batchRuleset = (pBatch->nElem > 0) ? ((msg_t*) pBatch->pElem[0].pUsrp)->pRuleset : NULL; + batchRuleset = (pBatch->nElem > 0) ? pBatch->pElem[0].pMsg->pRuleset : NULL; for(i = 0 ; i < pBatch->nElem && !*(pBatch->pbShutdownImmediate) ; i++) { - pMsg = (msg_t*) pBatch->pElem[i].pUsrp; + pMsg = pBatch->pElem[i].pMsg; if((pMsg->msgFlags & NEEDS_ACLCHK_U) != 0) { DBGPRINTF("msgConsumer: UDP ACL must be checked for message (hostname-based)\n"); if(net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN, fromHostIP) != RS_RET_OK) @@ -603,7 +603,7 @@ submitMsg2(msg_t *pMsg) } MsgPrepareEnqueue(pMsg); - qqueueEnqObj(pQueue, pMsg->flowCtlType, (void*) pMsg); + qqueueEnqMsg(pQueue, pMsg->flowCtlType, pMsg); finalize_it: RETiRet; |