summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-06 15:24:43 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-06 15:24:43 +0100
commit7253a2aa3f1644119222cb8b5d51c36774982705 (patch)
tree8925ae2f82bfed5ebb68250f6917ccc6c5b64eb8
parent4ece2deb037b4d1bcb296731b0bd587b2b7d158e (diff)
downloadrsyslog-7253a2aa3f1644119222cb8b5d51c36774982705.tar.gz
rsyslog-7253a2aa3f1644119222cb8b5d51c36774982705.tar.bz2
rsyslog-7253a2aa3f1644119222cb8b5d51c36774982705.zip
cleanup
-rw-r--r--action.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/action.c b/action.c
index 707fc0fb..ba49a5ce 100644
--- a/action.c
+++ b/action.c
@@ -1072,11 +1072,14 @@ finalize_it:
RETiRet;
}
-// TODO: #warning do we really need to return something?
+/* Note: we currently need to return an iRet, as this is used in
+ * direct mode. TODO: However, it may be worth further investigating this,
+ * as it looks like there is no ultimate consumer of this code.
+ * rgerhards, 2013-11-06
+ */
static rsRetVal
actionCommit(action_t *pThis, wti_t *pWti)
{
-int iter = 0;
sbool bDone;
DEFiRet;
@@ -1096,7 +1099,7 @@ int iter = 0;
bDone = 0;
do {
iRet = actionTryCommit(pThis, pWti);
- DBGPRINTF("DDDD: actionCommit, in retry loop, iter %d, iRet %d\n", ++iter, iRet);
+ DBGPRINTF("actionCommit, in retry loop, iRet %d\n", iRet);
if(iRet == RS_RET_FORCE_TERM) {
ABORT_FINALIZE(RS_RET_FORCE_TERM);
} else if(iRet == RS_RET_OK || iRet == RS_RET_ACTION_FAILED) {