diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
| commit | ada87cbaefecff9d32f3d008876f2eec59335ded (patch) | |
| tree | c52339b2e2c2cbfc7a7152bf1cc65912b46932c2 /plugins/omprog/omprog.c | |
| parent | 11ab3c800043b036132b0fc96d20bcba637a72b6 (diff) | |
| parent | 9039fad4019cb9a0f96eb296835476841b453dd3 (diff) | |
| download | rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.gz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.bz2 rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.zip | |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
runtime/debug.c
runtime/rsyslog.h
tests/Makefile.am
tests/diag.sh
tests/nettester.c
tools/syslogd.c
Diffstat (limited to 'plugins/omprog/omprog.c')
| -rw-r--r-- | plugins/omprog/omprog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index 01fa7cea..2687e7a3 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -169,7 +169,7 @@ openPipe(instanceData *pData) /*NO CODE HERE - WILL NEVER BE REACHED!*/ } - DBGPRINTF("child has pid %d\n", cpid); + DBGPRINTF("child has pid %d\n", (int) cpid); pData->fdPipe = pipefd[1]; pData->pid = cpid; close(pipefd[0]); @@ -191,7 +191,6 @@ cleanup(instanceData *pData) assert(pData != NULL); assert(pData->bIsRunning == 1); -RUNLOG_VAR("%d", pData->pid); ret = waitpid(pData->pid, &status, 0); if(ret != pData->pid) { /* if waitpid() fails, we can not do much - try to ignore it... */ |