From 13dfec032daeed349dbe2be9251dbc5627264d79 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 13 Feb 2008 07:32:46 +0000
Subject: changed interface of logmsg() to make it more straightforward

---
 plugins/imfile/imfile.c |  2 +-
 plugins/imklog/imklog.c |  2 +-
 syslogd.c               | 13 +++++--------
 syslogd.h               |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 1b07ee62..d37df02d 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -101,7 +101,7 @@ static rsRetVal enqLine(fileInfo_t *pInfo, uchar *pLine)
 		pMsg->iSeverity = pInfo->iSeverity;
 		pMsg->bParseHOSTNAME = 0;
 		getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
-		logmsg(pri, pMsg, flags); /* some time, CHKiRet() will work here, too [today NOT!] */
+		logmsg(pMsg, flags); /* some time, CHKiRet() will work here, too [today NOT!] */
 finalize_it:
 	RETiRet;
 }
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 825ebcf4..5bc0f068 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -142,7 +142,7 @@ static rsRetVal writeSyslogV(int iPRI, const char *szFmt, va_list va)
 	getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
 
 	/* provide message to the queue engine */
-	logmsg(iPRI, pMsg, INTERNAL_MSG);
+	logmsg(pMsg, INTERNAL_MSG);
 
 finalize_it:
 	RETiRet;
diff --git a/syslogd.c b/syslogd.c
index f42f48a9..bb4cda87 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1315,7 +1315,7 @@ rsRetVal printline(char *hname, char *msg, int bParseHost)
 	if(MsgSetUxTradMsg(pMsg, p) != 0)
 		ABORT_FINALIZE(RS_RET_ERR);
 
-	logmsg(pri, pMsg, SYNC_FILE);
+	logmsg(pMsg, SYNC_FILE);
 
 finalize_it:
 	RETiRet;
@@ -1531,7 +1531,7 @@ logmsgInternal(int pri, char *msg, int flags)
 		/* we have the queue, so we can simply provide the 
 		 * message to the queue engine.
 		 */
-		logmsg(pri, pMsg, flags);
+		logmsg(pMsg, flags);
 	}
 finalize_it:
 	RETiRet;
@@ -2151,18 +2151,15 @@ static int parseLegacySyslogMsg(msg_t *pMsg, int flags)
  * circumstances given.
  */
 void
-logmsg(int pri, msg_t *pMsg, int flags)
+logmsg(msg_t *pMsg, int flags)
 {
 	char *msg;
-	char PRItext[20];
 
 	BEGINfunc
 	assert(pMsg != NULL);
 	assert(pMsg->pszUxTradMsg != NULL);
 	msg = (char*) pMsg->pszUxTradMsg;
-	dbgprintf("logmsg: %s, flags %x, from '%s', msg %s\n",
-	        textpri(PRItext, sizeof(PRItext) / sizeof(char), pri),
-		flags, getRcvFrom(pMsg), msg);
+	dbgprintf("logmsg: flags %x, from '%s', msg %s\n", flags, getRcvFrom(pMsg), msg);
 
 	/* rger 2005-11-24 (happy thanksgiving!): we now need to check if we have
 	 * a traditional syslog message or one formatted according to syslog-protocol.
@@ -4248,7 +4245,7 @@ static void processImInternal(void)
 	msg_t *pMsg;
 
 	while(iminternalRemoveMsg(&iPri, &pMsg, &iFlags) == RS_RET_OK) {
-		logmsg(iPri, pMsg, iFlags);
+		logmsg(pMsg, iFlags);
 	}
 }
 
diff --git a/syslogd.h b/syslogd.h
index 5551fee8..8bfcc5c7 100644
--- a/syslogd.h
+++ b/syslogd.h
@@ -70,7 +70,7 @@ int getSubString(uchar **ppSrc,  char *pDst, size_t DstSize, char cSep);
  * module interface -- rgerhards, 2007-12-12
  */
 rsRetVal logmsgInternal(int pri, char *msg, int flags);
-void logmsg(int pri, msg_t *pMsg, int flags);
+void logmsg(msg_t *pMsg, int flags);
 extern int glblHadMemShortage; /* indicates if we had memory shortage some time during the run */
 extern char LocalHostName[];
 extern int family;
-- 
cgit