From 186ceaaacb3265ee360f83615e48df0b06646974 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 14 Feb 2012 13:57:25 +0100 Subject: Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4 (backport from version 1.7.9) --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ recording.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 495c2276..a2065978 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2371,3 +2371,5 @@ Ralf Schueler with gcc 4.4" from version 1.7.8 to 1.6.0-3 for backporting "Modified cSVDRP::CmdGRAB() to avoid writing into const data" from version 1.7.8 to 1.6.0-3 + for backporting "Fixed cRecordings::DelByName() to avoid compilation errors with + gcc 4.4" from version 1.7.9 to 1.6.0-3 diff --git a/HISTORY b/HISTORY index 4ec9ff2a..d6f2e8a2 100644 --- a/HISTORY +++ b/HISTORY @@ -5767,3 +5767,5 @@ Video Disk Recorder Revision History (backport from version 1.7.8, thanks to Ralf Schueler). - Modified cSVDRP::CmdGRAB() to avoid writing into const data (backport from version 1.7.8, thanks to Ralf Schueler). +- Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4 + (backport from version 1.7.9, thanks to Ralf Schueler). diff --git a/recording.c b/recording.c index e74fc839..a10208bf 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 1.162.1.1 2012/02/14 13:47:29 kls Exp $ + * $Id: recording.c 1.162.1.2 2012/02/14 13:57:25 kls Exp $ */ #include "recording.h" @@ -1022,7 +1022,7 @@ void cRecordings::DelByName(const char *FileName) if (recording) { cThreadLock DeletedRecordingsLock(&DeletedRecordings); Del(recording, false); - char *ext = strrchr(recording->FileName(), '.'); + char *ext = strrchr(recording->fileName, '.'); if (ext) { strncpy(ext, DELEXT, strlen(ext)); recording->fileSizeMB = DirSizeMB(recording->FileName()); -- cgit v1.2.3