File vdr-glibc-2.10.diff of Package vdr

Overview Repositories Revisions Requests Users Attributes Meta

File vdr-glibc-2.10.diff of Package vdr (Revision e97547a581447f342879709953e907f6)

Currently displaying revision e97547a581447f342879709953e907f6 , Show latest

diff -NaurwBp vdr-1.6.0-orig/recording.c vdr-1.6.0/recording.c
--- vdr-1.6.0-orig/recording.c	2009-11-17 18:11:20.000000000 +0100
+++ vdr-1.6.0/recording.c	2009-11-17 18:49:04.000000000 +0100
@@ -548,8 +548,8 @@ cRecording::cRecording(cTimer *Timer, co
      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);
@@ -606,7 +606,7 @@ cRecording::cRecording(const char *FileN
 #endif /* SORTRECORDS */
   fileName = strdup(FileName);
   FileName += strlen(VideoDirectory) + 1;
-  char *p = strrchr(FileName, '/');
+  const char *p = strrchr(FileName, '/');
 
   name = NULL;
 #ifdef USE_DVDARCHIVE
@@ -1652,7 +1652,7 @@ void cRecordings::DelByName(const char *
   if (recording) {
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      Del(recording, false);
-     char *ext = strrchr(recording->FileName(), '.');
+     char *ext = strrchr((char*) recording->FileName(), '.');
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
         recording->fileSizeMB = DirSizeMB(recording->FileName());
diff -NaurwBp vdr-1.6.0-orig/svdrp.c vdr-1.6.0/svdrp.c
--- vdr-1.6.0-orig/svdrp.c	2009-11-17 18:11:20.000000000 +0100
+++ vdr-1.6.0/svdrp.c	2009-11-17 18:53:11.000000000 +0100
@@ -746,7 +746,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;
@@ -806,12 +806,12 @@ void cSVDRP::CmdGRAB(const char *Option)
      if (FileName) {
         if (grabImageDir) {
            cString s;
-           char *slash = strrchr(FileName, '/');
+           char *slash = strrchr((char*) FileName, '/');
            if (!slash) {
               s = AddDirectory(grabImageDir, FileName);
               FileName = s;
               }
-           slash = strrchr(FileName, '/'); // there definitely is one
+           slash = strrchr((char*) FileName, '/'); // there definitely is one
            *slash = 0;
            char *r = realpath(FileName, RealFileName);
            *slash = '/';

Places

File vdr-glibc-2.10.diff of Package vdr (Revision e97547a581447f342879709953e907f6)

Places