From 4ea90cefe831c52777f1be0877b499f432529cc7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 20 Oct 2013 09:57:55 +0200
Subject: Fixed some compiler warnings with gcc-4.6.3

---
 CONTRIBUTORS | 1 +
 HISTORY      | 1 +
 recording.c  | 4 ++--
 svdrp.c      | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3c31e1cc..7fb012f9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1173,6 +1173,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  and add support for DVB-S2 "Input Stream Identifier" (ISI)
  for helping to debug and understand subtitle page refreshes
  for a patch that was used to implement the SVDRP command RENR
+ for fixing some compiler warnings with gcc-4.6.3
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index e5255e70..45b247b0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8015,3 +8015,4 @@ Video Disk Recorder Revision History
 - Changed the return value of cPositioner::HorizonLongitude() to 0 in case the
   latitude of the antenna location is beyond +/-81 degrees.
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed some compiler warnings with gcc-4.6.3 (thanks to Rolf Ahrenberg).
diff --git a/recording.c b/recording.c
index e41a89ea..d6ffb41e 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 3.7 2013/10/16 10:24:28 kls Exp $
+ * $Id: recording.c 3.8 2013/10/20 09:51:23 kls Exp $
  */
 
 #include "recording.h"
@@ -1693,7 +1693,7 @@ void cDirCopier::Action(void)
                     off_t FileSizeSrc = FileSize(FileNameSrc);
                     off_t FileSizeDst = FileSize(FileNameDst);
                     if (FileSizeSrc != FileSizeDst) {
-                       esyslog("ERROR: file size discrepancy: %lld != %lld", FileSizeSrc, FileSizeDst);
+                       esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst);
                        break;
                        }
                     }
diff --git a/svdrp.c b/svdrp.c
index 7f91479f..4e7665b9 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -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 3.3 2013/10/14 09:49:38 kls Exp $
+ * $Id: svdrp.c 3.4 2013/10/20 09:53:13 kls Exp $
  */
 
 #include "svdrp.h"
@@ -686,7 +686,7 @@ void cSVDRP::CmdDELR(const char *Option)
         cRecording *recording = recordings.Get(strtol(Option, NULL, 10) - 1);
         if (recording) {
            if (int RecordingInUse = recording->IsInUse())
-              Reply(550, RecordingInUseMessage(RecordingInUse, Option, recording));
+              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, recording));
            else {
               if (recording->Delete()) {
                  Reply(250, "Recording \"%s\" deleted", Option);
@@ -1564,7 +1564,7 @@ void cSVDRP::CmdRENR(const char *Option)
         cRecording *recording = recordings.Get(strtol(num, NULL, 10) - 1);
         if (recording) {
            if (int RecordingInUse = recording->IsInUse())
-              Reply(550, RecordingInUseMessage(RecordingInUse, Option, recording));
+              Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, recording));
            else {
               if (c)
                  option = skipspace(++option);
-- 
cgit v1.2.3