minor: optimized dbgprintf() use

1 files changed, 17 insertions, 17 deletions

diff --git a/action.c b/action.c
index bcb23659..80ed1a61 100644
--- a/action.c
+++ b/action.c
@@ -324,7 +324,7 @@ actionConstructFinalize(action_t *pThis)
  	
 
 	CHKiRet(qqueueStart(pThis->pQueue));
-	dbgprintf("Action %p: queue %p created\n", pThis, pThis->pQueue);
+	DBGPRINTF("Action %p: queue %p created\n", pThis, pThis->pQueue);
 	
 	/* and now reset the queue params (see comment in its function header!) */
 	actionResetQueueParams();
@@ -412,7 +412,7 @@ static rsRetVal actionTryResume(action_t *pThis)
 	if(iRet == RS_RET_OK)
 		actionResume(pThis);
 
-	dbgprintf("actionTryResume: iRet: %d, next retry (if applicable): %u [now %u]\n",
+	DBGPRINTF("actionTryResume: iRet: %d, next retry (if applicable): %u [now %u]\n",
 		iRet, (unsigned) pThis->ttResumeRtry, (unsigned) ttNow);
 
 	RETiRet;
@@ -511,7 +511,7 @@ actionCallDoAction(action_t *pAction, msg_t *pMsg)
 			/* call configured action */
 			iRet = pAction->pMod->mod.om.doAction(pAction->ppMsgs, pMsg->msgFlags, pAction->pModData);
 			if(iRet == RS_RET_SUSPENDED) {
-				dbgprintf("Action requested to be suspended, done that.\n");
+				DBGPRINTF("Action requested to be suspended, done that.\n");
 				actionSuspend(pAction, getActNow(pAction));
 			}
 		}
@@ -519,7 +519,7 @@ actionCallDoAction(action_t *pAction, msg_t *pMsg)
 	} while(iRet == RS_RET_SUSPENDED && (pAction->iResumeRetryCount == -1 || iRetries < pAction->iResumeRetryCount)); /* do...while! */
 
 	if(iRet == RS_RET_DISABLE_ACTION) {
-		dbgprintf("Action requested to be disabled, done that.\n");
+		DBGPRINTF("Action requested to be disabled, done that.\n");
 		pAction->bEnabled = 0; /* that's it... */
 	}
 
@@ -595,16 +595,16 @@ static rsRetVal setActionQueType(void __attribute__((unused)) *pVal, uchar *pszT
 
 	if (!strcasecmp((char *) pszType, "fixedarray")) {
 		ActionQueType = QUEUETYPE_FIXED_ARRAY;
-		dbgprintf("action queue type set to FIXED_ARRAY\n");
+		DBGPRINTF("action queue type set to FIXED_ARRAY\n");
 	} else if (!strcasecmp((char *) pszType, "linkedlist")) {
 		ActionQueType = QUEUETYPE_LINKEDLIST;
-		dbgprintf("action queue type set to LINKEDLIST\n");
+		DBGPRINTF("action queue type set to LINKEDLIST\n");
 	} else if (!strcasecmp((char *) pszType, "disk")) {
 		ActionQueType = QUEUETYPE_DISK;
-		dbgprintf("action queue type set to DISK\n");
+		DBGPRINTF("action queue type set to DISK\n");
 	} else if (!strcasecmp((char *) pszType, "direct")) {
 		ActionQueType = QUEUETYPE_DIRECT;
-		dbgprintf("action queue type set to DIRECT (no queueing at all)\n");
+		DBGPRINTF("action queue type set to DIRECT (no queueing at all)\n");
 	} else {
 		errmsg.LogError(0, RS_RET_INVALID_PARAMS, "unknown actionqueue parameter: %s", (char *) pszType);
 		iRet = RS_RET_INVALID_PARAMS;
@@ -650,14 +650,14 @@ actionWriteToAction(action_t *pAction)
 		/* we need to care about multiple occurences */
 		if(   pAction->iExecEveryNthOccurTO > 0
 		   && (getActNow(pAction) - pAction->tLastOccur) > pAction->iExecEveryNthOccurTO) {
-		  	dbgprintf("n-th occurence handling timed out (%d sec), restarting from 0\n",
+		  	DBGPRINTF("n-th occurence handling timed out (%d sec), restarting from 0\n",
 				  (int) (getActNow(pAction) - pAction->tLastOccur));
 			pAction->iNbrNoExec = 0;
 			pAction->tLastOccur = getActNow(pAction);
 		   }
 		if(pAction->iNbrNoExec < pAction->iExecEveryNthOccur - 1) {
 			++pAction->iNbrNoExec;
-			dbgprintf("action %p passed %d times to execution - less than neded - discarding\n",
+			DBGPRINTF("action %p passed %d times to execution - less than neded - discarding\n",
 			  pAction, pAction->iNbrNoExec);
 			FINALIZE;
 		} else {
@@ -680,7 +680,7 @@ actionWriteToAction(action_t *pAction)
 
 		if((pMsg = MsgDup(pAction->f_pMsg)) == NULL) {
 			/* it failed - nothing we can do against it... */
-			dbgprintf("Message duplication failed, dropping repeat message.\n");
+			DBGPRINTF("Message duplication failed, dropping repeat message.\n");
 			ABORT_FINALIZE(RS_RET_ERR);
 		}
 
@@ -702,7 +702,7 @@ actionWriteToAction(action_t *pAction)
 		pAction->f_pMsg = pMsg;	/* use the new msg (pointer will be restored below) */
 	}
 
-	dbgprintf("Called action, logging to %s\n", module.GetStateName(pAction->pMod));
+	DBGPRINTF("Called action, logging to %s\n", module.GetStateName(pAction->pMod));
 
 	/* now check if we need to drop the message because otherwise the action would be too
 	 * frequently called. -- rgerhards, 2008-04-08
@@ -713,7 +713,7 @@ actionWriteToAction(action_t *pAction)
 	if(pAction->f_time != 0 && pAction->iSecsExecOnceInterval > 0 &&
 	   pAction->iSecsExecOnceInterval + pAction->tLastExec > getActNow(pAction)) {
 		/* in this case we need to discard the message - its not yet time to exec the action */
-		dbgprintf("action not yet ready again to be executed, onceInterval %d, tCurr %d, tNext %d\n",
+		DBGPRINTF("action not yet ready again to be executed, onceInterval %d, tCurr %d, tNext %d\n",
 			  (int) pAction->iSecsExecOnceInterval, (int) getActNow(pAction),
 			  (int) (pAction->iSecsExecOnceInterval + pAction->tLastExec));
 		pAction->tLastExec = getActNow(pAction); /* re-init time flags */
@@ -786,7 +786,7 @@ doActionCallAction(action_t *pAction, msg_t *pMsg)
 	    !strcmp(getPROCID(pMsg, LOCK_MUTEX), getPROCID(pAction->f_pMsg, LOCK_MUTEX)) &&
 	    !strcmp(getAPPNAME(pMsg, LOCK_MUTEX), getAPPNAME(pAction->f_pMsg, LOCK_MUTEX))) {
 		pAction->f_prevcount++;
-		dbgprintf("msg repeated %d times, %ld sec of %d.\n",
+		DBGPRINTF("msg repeated %d times, %ld sec of %d.\n",
 		    pAction->f_prevcount, (long) getActNow(pAction) - pAction->f_time,
 		    repeatinterval[pAction->f_repeatcount]);
 		/* use current message, so we have the new timestamp (means we need to discard previous one) */
@@ -909,7 +909,7 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringReques
 	assert(ppAction != NULL);
 	assert(pMod != NULL);
 	assert(pOMSR != NULL);
-	dbgprintf("Module %s processed this config line.\n", module.GetName(pMod));
+	DBGPRINTF("Module %s processed this config line.\n", module.GetName(pMod));
 
 	CHKiRet(actionConstruct(&pAction)); /* create action object first */
 	pAction->pMod = pMod;
@@ -968,7 +968,7 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringReques
 			pAction->eParamPassing = ACT_STRING_PASSING;
 		}
 
-		dbgprintf("template: '%s' assigned\n", pTplName);
+		DBGPRINTF("template: '%s' assigned\n", pTplName);
 	}
 
 	pAction->pMod = pMod;
@@ -977,7 +977,7 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringReques
 	if(pMod->isCompatibleWithFeature(sFEATURERepeatedMsgReduction) == RS_RET_OK)
 		pAction->f_ReduceRepeated = bReduceRepeatMsgs;
 	else {
-		dbgprintf("module is incompatible with RepeatedMsgReduction - turned off\n");
+		DBGPRINTF("module is incompatible with RepeatedMsgReduction - turned off\n");
 		pAction->f_ReduceRepeated = 0;
 	}
 	pAction->bEnabled = 1; /* action is enabled */