diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
| commit | 9568e7dbbb50ceb7464b659283e97a63ba3b1bd6 (patch) | |
| tree | c5f10c015dae3fcfcf52e2bc5985d40cb70fa119 /tools/syslogd.c | |
| parent | b941f68aaeec4bd458328e09121b623ac63f6dd6 (diff) | |
| parent | 9f1e195f3d642de85a92199ef9882b820d3fec21 (diff) | |
| download | rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.gz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.xz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/glbl.c
tools/omdiscard.c
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 1ce810bf..9d18ce7d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -571,7 +571,7 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags) } if(bHaveMainQueue == 0) { /* not yet in queued mode */ - iminternalAddMsg(pri, pMsg); + iminternalAddMsg(pMsg); } else { /* we have the queue, so we can simply provide the * message to the queue engine. @@ -1865,10 +1865,9 @@ void sigttin_handler() */ static inline void processImInternal(void) { - int iPri; msg_t *pMsg; - while(iminternalRemoveMsg(&iPri, &pMsg) == RS_RET_OK) { + while(iminternalRemoveMsg(&pMsg) == RS_RET_OK) { submitMsg(pMsg); } } |