summaryrefslogtreecommitdiff
path: root/tools.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2011-03-20 15:25:06 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2011-03-20 15:25:06 +0100
commita914aed05adaa0ced56dd1bbafbaf3fb9300c0b0 (patch)
treef8e90917e7d063d1b57b51b053326f154774798c /tools.c
parentd7d57c3d2ab37677a397ec8338daf26041439e0f (diff)
downloadvdr-a914aed05adaa0ced56dd1bbafbaf3fb9300c0b0.tar.gz
vdr-a914aed05adaa0ced56dd1bbafbaf3fb9300c0b0.tar.bz2
Fixed cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE
Diffstat (limited to 'tools.c')
-rw-r--r--tools.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools.c b/tools.c
index d03595e6..a493529d 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.c 2.12 2011/02/25 14:58:31 kls Exp $
+ * $Id: tools.c 2.13 2011/03/20 15:20:00 kls Exp $
*/
#include "tools.h"
@@ -1575,9 +1575,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
cachedstart = min(cachedstart, curpos);
#endif
ssize_t bytesRead = safe_read(fd, Data, Size);
-#ifdef USE_FADVISE
if (bytesRead > 0) {
curpos += bytesRead;
+#ifdef USE_FADVISE
cachedend = max(cachedend, curpos);
// Read ahead:
@@ -1597,8 +1597,9 @@ ssize_t cUnbufferedFile::Read(void *Data, size_t Size)
}
else
ahead = curpos; // jumped -> we really don't want any readahead, otherwise e.g. fast-rewind gets in trouble.
+#endif
}
-
+#ifdef USE_FADVISE
if (cachedstart < cachedend) {
if (curpos - cachedstart > READCHUNK * 2) {
// current position has moved forward enough, shrink tail window.