summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-09-26 23:40:38 +0200
committerMichael Biebl <biebl@debian.org>2014-09-26 23:40:38 +0200
commit7bfd178d59a2c706d46092d745b54c61403cb44a (patch)
treefe5db3a861d09953408ad79a21318eda3afed7de /tools
parent1dfcd909d90f6fad4a612b6fd998d7473a9da399 (diff)
downloadrsyslog-7bfd178d59a2c706d46092d745b54c61403cb44a.tar.gz
Imported Upstream version 8.4.1upstream/8.4.1upstream
Diffstat (limited to 'tools')
-rw-r--r--tools/rsyslogd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
index abff2c6..a0fe02c 100644
--- a/tools/rsyslogd.c
+++ b/tools/rsyslogd.c
@@ -491,8 +491,8 @@ logmsgInternalSelf(const int iErr, const int pri, const size_t lenMsg,
pszTag[32] = '\0'; /* just to make sure... */
MsgSetTAG(pMsg, pszTag, len);
}
- pMsg->iFacility = LOG_FAC(pri);
- pMsg->iSeverity = LOG_PRI(pri);
+ pMsg->iFacility = pri2fac(pri);
+ pMsg->iSeverity = pri2sev(pri);
flags |= INTERNAL_MSG;
pMsg->msgFlags = flags;
@@ -540,7 +540,7 @@ logmsgInternal(int iErr, int pri, const uchar *const msg, int flags)
(bufModMsg == NULL) ? (char*)msg : bufModMsg,
flags));
} else {
- stdlog_log(stdlog_hdl, LOG_PRI(pri), "%s",
+ stdlog_log(stdlog_hdl, pri2sev(pri), "%s",
(bufModMsg == NULL) ? (char*)msg : bufModMsg);
}
@@ -553,7 +553,7 @@ logmsgInternal(int iErr, int pri, const uchar *const msg, int flags)
* supressor statement.
*/
if(((Debug == DEBUG_FULL || !doFork) && ourConf->globals.bErrMsgToStderr) || iConfigVerify) {
- if(LOG_PRI(pri) == LOG_ERR)
+ if(pri2sev(pri) == LOG_ERR)
fprintf(stderr, "rsyslogd: %s\n", (bufModMsg == NULL) ? (char*)msg : bufModMsg);
}