diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | recording.c | 8 | ||||
| -rw-r--r-- | svdrp.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3d883c88..1767899e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -920,6 +920,7 @@ Ludwig Nussel <ludwig.nussel@web.de> for a hint on using _nl_msg_cat_cntr for adding some missing 'const' keywords for pointing out that "%016llX" should be used instead of "%016LX" + for adding some missing 'const' keywords to avoid compilation errors with gcc 4.4 Thomas Koch <tom@harhar.net> for his support in keeping the Premiere World channels up to date in 'channels.conf' @@ -1827,6 +1828,7 @@ Ville Skyttä <ville.skytta@iki.fi> menu for adding missing #include <limits.h> to epg.c and menuitems.h for fixing various spelling errors and improving PLUGINS.html + for adding some missing 'const' keywords to avoid compilation errors with gcc 4.4 Steffen Beyer <cpunk@reactor.de> for fixing setting the colored button help after deleting a recording in case the next @@ -6125,3 +6125,5 @@ Video Disk Recorder Revision History - Fixed handling the length of DiSEqC command sequences (reported by Reinhard Nissl). - Fixed cOsdMenu::Display() in case the menu size has changed (thanks to Reinhard Nissl). +- Added some missing 'const' keywords to avoid compilation errors with gcc 4.4 + (thanks to Ville Skyttä and Ludwig Nussel). diff --git a/recording.c b/recording.c index e33d20bc..28a93a6a 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.13 2009/05/24 15:11:28 kls Exp $ + * $Id: recording.c 2.14 2009/06/06 13:39:40 kls Exp $ */ #include "recording.h" @@ -623,8 +623,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event) Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH); Subtitle = SubtitleBuffer; } - char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); - char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); + const char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); + const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); if (macroTITLE || macroEPISODE) { name = strdup(Timer->File()); name = strreplace(name, TIMERMACRO_TITLE, Title); @@ -673,7 +673,7 @@ cRecording::cRecording(const char *FileName) sortBuffer = NULL; fileName = strdup(FileName); FileName += strlen(VideoDirectory) + 1; - char *p = strrchr(FileName, '/'); + const char *p = strrchr(FileName, '/'); name = NULL; info = new cRecordingInfo; @@ -10,7 +10,7 @@ * and interact with the Video Disk Recorder - or write a full featured * graphical interface that sits on top of an SVDRP connection. * - * $Id: svdrp.c 2.3 2009/04/13 13:35:29 kls Exp $ + * $Id: svdrp.c 2.4 2009/06/06 13:42:52 kls Exp $ */ #include "svdrp.h" @@ -739,7 +739,7 @@ void cSVDRP::CmdGRAB(const char *Option) char *strtok_next; FileName = strtok_r(p, delim, &strtok_next); // image type: - char *Extension = strrchr(FileName, '.'); + const char *Extension = strrchr(FileName, '.'); if (Extension) { if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0) Jpeg = true; |