summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--timers.c5
-rw-r--r--timers.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index 39846b1d..cada8f70 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6898,3 +6898,4 @@ Video Disk Recorder Revision History
- Fixed getting the subsystem ids of DVB devices in case they have been rearranged
via udev rules.
- Added several cTimer::Set...() functions (suggested by Alexander Rieger).
+- Changed the return value of cTimer::SetFile() to 'void'.
diff --git a/timers.c b/timers.c
index 686f392e..9163a344 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: timers.c 2.6 2012/02/20 15:37:01 kls Exp $
+ * $Id: timers.c 2.7 2012/02/20 15:51:55 kls Exp $
*/
#include "timers.h"
@@ -384,11 +384,10 @@ time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
return mktime(&tm);
}
-char *cTimer::SetFile(const char *File)
+void cTimer::SetFile(const char *File)
{
if (!isempty(File))
Utf8Strn0Cpy(file, File, sizeof(file));
- return file;
}
bool cTimer::Matches(time_t t, bool Directly, int Margin) const
diff --git a/timers.h b/timers.h
index 778ed970..aa746b17 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: timers.h 2.2 2012/02/20 15:24:28 kls Exp $
+ * $Id: timers.h 2.3 2012/02/20 15:52:57 kls Exp $
*/
#ifndef __TIMERS_H
@@ -75,7 +75,7 @@ public:
bool DayMatches(time_t t) const;
static time_t IncDay(time_t t, int Days);
static time_t SetTime(time_t t, int SecondsFromMidnight);
- char *SetFile(const char *File);
+ void SetFile(const char *File);
bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
int Matches(const cEvent *Event, int *Overlap = NULL) const;
bool Expired(void) const;