frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed some compiler warnings with gcc-4.6.3

This commit is contained in:
Klaus Schmidinger 2013-10-20 09:57:55 +02:00
parent 97eb54738f
commit 4ea90cefe8
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -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

1
HISTORY
View File

@ -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).

4
recording.c
View File

@ -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;
}
}

6
svdrp.c
View File

@ -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);