From 26a17d704a9396897d17aa12d877ef23eaa5dd50 Mon Sep 17 00:00:00 2001 From: Frank Neumann Date: Sun, 7 May 2017 10:39:01 +0200 Subject: Commit 0003-revert-now-obsolete-pointer-params.diff (thx TomJoad@vdr-portal.de) --- epgsearchext.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'epgsearchext.c') diff --git a/epgsearchext.c b/epgsearchext.c index 28ea0b5..5d45f8a 100644 --- a/epgsearchext.c +++ b/epgsearchext.c @@ -1304,8 +1304,7 @@ void cSearchExt::CheckExistingRecordings(cSearchResults* pResults) LogFile.Log(3,"analysing existing recordings for search timer '%s'...", search); // how many recordings do we already have? - cRecordings *vdrrecordings = NULL; - int num = GetCountRecordings(vdrrecordings); + int num = GetCountRecordings(); cSearchResult* pResultObj = NULL; int remain = pauseOnNrRecordings - num; @@ -1433,17 +1432,15 @@ cTimerObjList* cSearchExt::GetTimerList(const cTimers* vdrtimers, cTimerObjList* } // counts the currently existent recordings triggered by this search timer -int cSearchExt::GetCountRecordings(cRecordings *vdrrecordings) +int cSearchExt::GetCountRecordings() { int countRecs = 0; #if VDRVERSNUM > 20300 - if (!vdrrecordings) { - LOCK_RECORDINGS_READ; - vdrrecordings = (cRecordings *)Recordings; - } + LOCK_RECORDINGS_READ; + const cRecordings *vdrrecordings = Recordings; #else - vdrrecordings = &Recordings; + cRecordings *vdrrecordings = &Recordings; #endif for (const cRecording *recording = vdrrecordings->First(); recording; recording = vdrrecordings->Next(recording)) { -- cgit v1.2.3