diff options
| author | Michael Biebl <biebl@debian.org> | 2014-06-04 22:22:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-06-04 22:22:48 +0200 |
| commit | 7e740a53d3c2eeab4045d55b215a8c1a545203c9 (patch) | |
| tree | 83db8224788a9fd57e998a645445a59d5d642345 /runtime/stream.c | |
| parent | 7693d4302df6ac2ffef2e085857f44530f8d9705 (diff) | |
| parent | daeb0d03d4a65fa118ad25b34958fb9cacbbd6f4 (diff) | |
| download | rsyslog-7e740a53d3c2eeab4045d55b215a8c1a545203c9.tar.gz | |
Merge tag 'upstream/8.2.2' into experimental
Upstream version 8.2.2
Diffstat (limited to 'runtime/stream.c')
| -rw-r--r-- | runtime/stream.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 223ee93..1bf1c47 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -301,9 +301,11 @@ CheckFileChange(strm_t *pThis) if(stat((char*) pThis->pszCurrFName, &statName) == -1) ABORT_FINALIZE(RS_RET_IO_ERROR); DBGPRINTF("stream/after deserialize checking for file change on '%s', " - "inode %u/%u, size/currOffs %llu/%llu\n", - pThis->pszCurrFName, (unsigned) pThis->inode, - (unsigned) statName.st_ino, statName.st_size, pThis->iCurrOffs); + "inode %u/%u, size/currOffs %llu/%llu\n", + pThis->pszCurrFName, (unsigned) pThis->inode, + (unsigned) statName.st_ino, + (long long unsigned) statName.st_size, + (long long unsigned) pThis->iCurrOffs); if(pThis->inode != statName.st_ino || statName.st_size < pThis->iCurrOffs) { DBGPRINTF("stream: file %s has changed\n", pThis->pszCurrFName); pThis->iCurrOffs = 0; @@ -1460,7 +1462,7 @@ static rsRetVal strmSeek(strm_t *pThis, off64_t offs) DBGOPRINT((obj_t*) pThis, "file %d seek, pos %llu\n", pThis->fd, (long long unsigned) offs); i = lseek64(pThis->fd, offs, SEEK_SET); if(i != offs) { - DBGPRINTF("strmSeek: error %lld seeking to offset %lld\n", i, offs); + DBGPRINTF("strmSeek: error %lld seeking to offset %lld\n", i, (long long) offs); ABORT_FINALIZE(RS_RET_IO_ERROR); } pThis->iCurrOffs = offs; /* we are now at *this* offset */ |