diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
| commit | ec339c909734759e957065d00848abfcdfdfaf8f (patch) | |
| tree | 6c04178f35c7990af56fb74194b491ce91c51e47 /plugins | |
| parent | 9d98af3407423e723c114f009bd0915099580b6e (diff) | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| download | rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.gz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.xz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
runtime/cfsysline.c
tools/ompipe.c
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 6d7b6c98..cecf21c4 100644 --- a/plugins/imklog/bsd.c +++ b/plugins/imklog/bsd.c @@ -85,7 +85,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 @@ -96,7 +96,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 @@ -152,7 +152,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); } |