diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
| commit | aa0701b100084d61df6fff10be48bb088f551932 (patch) | |
| tree | 24acb326dccf074331b9556e959df72ae6307bef /plugins | |
| parent | 87472f58b4cd47762a7b134f0d8521cabc739cae (diff) | |
| parent | 096db025e2c06045226f9f3c70386e3394d60bb2 (diff) | |
| download | rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.gz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.xz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imklog/bsd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c index b7899353..0a4c7cd4 100644 --- a/plugins/imklog/bsd.c +++ b/plugins/imklog/bsd.c @@ -86,7 +86,7 @@ static int fklog = -1; /* /dev/klog */ static uchar *GetPath(void) { - return pszPath ? pszPath : _PATH_KLOG; + return pszPath ? pszPath : (uchar*) _PATH_KLOG; } /* open the kernel log - will be called inside the willRun() imklog @@ -97,7 +97,7 @@ klogWillRun(void) { DEFiRet; - fklog = open(GetPath(), O_RDONLY, 0); + fklog = open((char*)GetPath(), O_RDONLY, 0); if (fklog < 0) { dbgprintf("can't open %s (%d)\n", GetPath(), errno); iRet = RS_RET_ERR; // TODO: better error code @@ -153,7 +153,7 @@ readklog(void) break; } - for (p = pRcv; (q = strchr(p, '\n')) != NULL; p = q + 1) { + for (p = (char*)pRcv; (q = strchr(p, '\n')) != NULL; p = q + 1) { *q = '\0'; Syslog(LOG_INFO, (uchar*) p); } |