From 884d10fbf6ba5798271d50545498598924abf803 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 13 Jun 2009 13:35:49 +0200 Subject: [PATCH] Fixed variable types in cIndexFile --- CONTRIBUTORS | 2 +- HISTORY | 3 +-- recording.c | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5fd6f7c5..7cdfa22b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1640,7 +1640,7 @@ Udo Richter for reporting a problem with handling the maximum video file size for suggesting to add a note to the INSTALL file about using subdirectories to split a large disk into separate areas for VDR's video data and other stuff - for reporting wrong index types in cIndexFile::GetNextIFrame() + for reporting wrong variable types in cIndexFile Sven Kreiensen for his help in keeping 'channels.conf.terr' up to date diff --git a/HISTORY b/HISTORY index 36f06272..bf32b6a1 100644 --- a/HISTORY +++ b/HISTORY @@ -6134,5 +6134,4 @@ Video Disk Recorder Revision History - Added a plausibility check for the OSD percentage parameters to avoid problems in case the values are stored in the setup.conf file in a wrong way. -- Fixed index types in cIndexFile::GetNextIFrame() (reported by - Udo Richter). +- Fixed variable types in cIndexFile (reported by Udo Richter). diff --git a/recording.c b/recording.c index 5ba577f6..2ff7f6fa 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.15 2009/06/13 12:23:25 kls Exp $ + * $Id: recording.c 2.16 2009/06/13 13:34:08 kls Exp $ */ #include "recording.h" @@ -1529,8 +1529,8 @@ bool cIndexFile::Get(int Index, uint16_t *FileNumber, off_t *FileOffset, bool *I if (Independent) *Independent = index[Index].independent; if (Length) { - int fn = index[Index + 1].number; - int fo = index[Index + 1].offset; + uint16_t fn = index[Index + 1].number; + off_t fo = index[Index + 1].offset; if (fn == *FileNumber) *Length = fo - *FileOffset; else