diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 08:55:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 08:55:12 +0200 |
| commit | 2a6ff7d53d1c30f0d7efd022cf321736870c5629 (patch) | |
| tree | 154d41e3f50c63df37d45720775cb725c4afbb8f /plugins | |
| parent | 49fb431e0ce15da6a1e72cb541eadea3a3096ab6 (diff) | |
| download | rsyslog-2a6ff7d53d1c30f0d7efd022cf321736870c5629.tar.gz rsyslog-2a6ff7d53d1c30f0d7efd022cf321736870c5629.tar.bz2 rsyslog-2a6ff7d53d1c30f0d7efd022cf321736870c5629.zip | |
interface cleanup (probably not final)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imdiag/imdiag.c | 2 | ||||
| -rw-r--r-- | plugins/imfile/imfile.c | 2 | ||||
| -rw-r--r-- | plugins/impstats/impstats.c | 2 | ||||
| -rw-r--r-- | plugins/imptcp/imptcp.c | 1 | ||||
| -rw-r--r-- | plugins/imudp/imudp.c | 2 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 4 |
6 files changed, 6 insertions, 7 deletions
diff --git a/plugins/imdiag/imdiag.c b/plugins/imdiag/imdiag.c index 460b8472..09742537 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -220,7 +220,7 @@ doInjectMsg(int iNum) pMsg->msgFlags = NEEDS_PARSING | PARSE_HOSTNAME; MsgSetRcvFrom(pMsg, pRcvDummy); CHKiRet(MsgSetRcvFromIP(pMsg, pRcvIPDummy)); - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg(pMsg)); finalize_it: RETiRet; diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 64a7e032..d6e6ad0e 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -191,7 +191,7 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine) MsgSetRuleset(pMsg, pInfo->pRuleset); pInfo->multiSub.ppMsgs[pInfo->multiSub.nElem++] = pMsg; if(pInfo->multiSub.nElem == pInfo->multiSub.maxElem) - CHKiRet(multiSubmitMsg2(&pInfo->multiSub, NULL)); + CHKiRet(multiSubmitMsg(&pInfo->multiSub)); finalize_it: RETiRet; } diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c index ef2bebf7..62599969 100644 --- a/plugins/impstats/impstats.c +++ b/plugins/impstats/impstats.c @@ -138,7 +138,7 @@ doSubmitMsg(uchar *line) pMsg->iSeverity = runModConf->iSeverity; pMsg->msgFlags = 0; - submitMsg2(pMsg, NULL); + submitMsg(pMsg); finalize_it: RETiRet; diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index 6d2ecd2f..e7650812 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -664,7 +664,6 @@ doSubmitMsg(ptcpsess_t *pThis, struct syslogTime *stTime, time_t ttGenTime, mult msg_t *pMsg; ptcpsrv_t *pSrv; DEFiRet; -dbgprintf("DDDD: in imptcp doSubmitMSg()\n"); if(pThis->iMsg == 0) { DBGPRINTF("discarding zero-sized message\n"); diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index c0448cba..0dda30ec 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -383,7 +383,7 @@ processSocket(thrdInfo_t *pThrd, struct lstn_s *lstn, struct sockaddr_storage *f if(*pbIsPermitted == 2) pMsg->msgFlags |= NEEDS_ACLCHK_U; /* request ACL check after resolution */ CHKiRet(msgSetFromSockinfo(pMsg, &frominet)); - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg(pMsg)); STATSCOUNTER_INC(lstn->ctrSubmit, lstn->mutCtrSubmit); } } diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 1ff89353..2f7daf87 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -995,11 +995,11 @@ if(ratelimit == NULL) localRet = ratelimitMsg(pMsg, ratelimit); if(localRet == RS_RET_OK_HAVE_REPMSG) { dbgprintf("DDDD: doing repeat submit!\n"); - CHKiRet(submitMsg2(ratelimitGetRepeatMsg(ratelimit), NULL)); + CHKiRet(submitMsg2(ratelimitGetRepeatMsg(ratelimit))); localRet = RS_RET_OK; } if(localRet == RS_RET_OK) - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg2(pMsg)); STATSCOUNTER_INC(ctrSubmit, mutCtrSubmit); finalize_it: |