diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-03 12:32:50 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-03 12:32:50 +0100 |
| commit | c55e0a5a06e69106bc346057dd61dcb98688a4aa (patch) | |
| tree | 0b9639a89adba961eb8ac2b55854c1aba9bf15a6 /tools/syslogd.c | |
| parent | feddb2cc8fa213725a14e556d0366aef8d3a4339 (diff) | |
| download | rsyslog-c55e0a5a06e69106bc346057dd61dcb98688a4aa.tar.gz rsyslog-c55e0a5a06e69106bc346057dd61dcb98688a4aa.tar.bz2 rsyslog-c55e0a5a06e69106bc346057dd61dcb98688a4aa.zip | |
queue: change generic msg ptr (pUsr) to be of msg_t type
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; |