r8652 - in /vdr/vdr-plugin-markad/trunk/debian: changelog patches/0002-Fixed-some-compiler-warnings.patch patches/series
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Thu May 27 20:44:23 UTC 2010
Author: tom-guest
Date: Thu May 27 20:44:14 2010
New Revision: 8652
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8652
Log:
Added 0002-Fixed-some-compiler-warnings.patch
Added:
vdr/vdr-plugin-markad/trunk/debian/patches/0002-Fixed-some-compiler-warnings.patch
Modified:
vdr/vdr-plugin-markad/trunk/debian/changelog
vdr/vdr-plugin-markad/trunk/debian/patches/series
Modified: vdr/vdr-plugin-markad/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/changelog?rev=8652&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-markad/trunk/debian/changelog Thu May 27 20:44:14 2010
@@ -11,6 +11,7 @@
* Removed cdbs from Build-Depends
* Updated debian/copyright
* Added 0001-Fixed-errno-undeclared.patch
+ * Added 0002-Fixed-some-compiler-warnings.patch
-- Thomas Günther <tom at toms-cafe.de> Tue, 25 May 2010 21:49:57 +0200
Added: vdr/vdr-plugin-markad/trunk/debian/patches/0002-Fixed-some-compiler-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/patches/0002-Fixed-some-compiler-warnings.patch?rev=8652&op=file
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/patches/0002-Fixed-some-compiler-warnings.patch (added)
+++ vdr/vdr-plugin-markad/trunk/debian/patches/0002-Fixed-some-compiler-warnings.patch Thu May 27 20:44:14 2010
@@ -1,0 +1,148 @@
+From b7c606a20063d600708e82ee9ad65d128dab77aa Mon Sep 17 00:00:00 2001
+From: Jochen Dolze <vdr at dolze.de>
+Date: Tue, 25 May 2010 15:10:21 +0200
+Subject: [PATCH] Fixed some compiler warnings
+
+---
+ Makefile | 2 ++
+ command/decoder.h | 3 +++
+ command/markad-standalone.cpp | 17 +++++++++--------
+ command/marks.cpp | 2 +-
+ command/video.cpp | 6 +++---
+ 5 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cac73da..1689906 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,11 +24,13 @@ dist:
+ @mkdir $(TMPDIR)/$(ARCHIVE)/plugin
+ @mkdir $(TMPDIR)/$(ARCHIVE)/plugin/po
+ @mkdir $(TMPDIR)/$(ARCHIVE)/command
++ @mkdir $(TMPDIR)/$(ARCHIVE)/command/po
+ @mkdir $(TMPDIR)/$(ARCHIVE)/command/logos
+ @cp -a plugin/*.cpp plugin/*.h plugin/Makefile $(TMPDIR)/$(ARCHIVE)/plugin
+ @cp -a plugin/po/*.po $(TMPDIR)/$(ARCHIVE)/plugin/po
+ @cp -a command/*.cpp command/*.h command/Makefile $(TMPDIR)/$(ARCHIVE)/command
+ @cp -a command/logos/*.pgm $(TMPDIR)/$(ARCHIVE)/command/logos
++ @cp -a command/po/*.po $(TMPDIR)/$(ARCHIVE)/command/po
+ @cp -a *.h COPYING HISTORY README INSTALL Makefile $(TMPDIR)/$(ARCHIVE)
+ @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+ @-rm -rf $(TMPDIR)/$(ARCHIVE)
+diff --git a/command/decoder.h b/command/decoder.h
+index 46e9f74..8f05108 100644
+--- a/command/decoder.h
++++ b/command/decoder.h
+@@ -12,6 +12,9 @@
+
+ #include <stdint.h>
+ #include <sched.h>
++#include <sys/types.h>
++#include <string.h>
++#include <cstdlib>
+
+ #ifndef DECLARE_ALIGNED
+ #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
+diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
+index c11f880..72fe12a 100644
+--- a/command/markad-standalone.cpp
++++ b/command/markad-standalone.cpp
+@@ -102,9 +102,10 @@ void *cOSDMessage::send(void *posd)
+ return NULL;
+ }
+
+- write(sock,"MESG ",5);
+- write(sock,osd->msg,strlen(osd->msg));
+- write(sock,"\r\n",2);
++ ssize_t ret;
++ ret=write(sock,"MESG ",5);
++ ret=write(sock,osd->msg,strlen(osd->msg));
++ ret=write(sock,"\r\n",2);
+
+ if (!osd->readreply(sock))
+ {
+@@ -112,7 +113,7 @@ void *cOSDMessage::send(void *posd)
+ return NULL;
+ }
+
+- write(sock,"QUIT\r\n",6);
++ ret=write(sock,"QUIT\r\n",6);
+
+ osd->readreply(sock);
+ close(sock);
+@@ -470,8 +471,8 @@ void cMarkAdStandalone::SaveFrame(int frame)
+ macontext.Video.Info.Height);
+
+ // Write pixel data
+- fwrite(macontext.Video.Data.Plane[0],1,
+- macontext.Video.Data.PlaneLinesize[0]*macontext.Video.Info.Height,pFile);
++ if (fwrite(macontext.Video.Data.Plane[0],1,
++ macontext.Video.Data.PlaneLinesize[0]*macontext.Video.Info.Height,pFile)) {};
+ // Close file
+ fclose(pFile);
+ }
+@@ -1227,7 +1228,7 @@ bool cMarkAdStandalone::RegenerateVDRIndex(const char *Directory)
+ struct stat statbuf;
+ if (!stat(spath,&statbuf))
+ {
+- chown(newpath,statbuf.st_uid, statbuf.st_gid);
++ if (chown(newpath,statbuf.st_uid, statbuf.st_gid)) {};
+ }
+ free(spath);
+ }
+@@ -1288,7 +1289,7 @@ bool cMarkAdStandalone::CreatePidfile(const char *Directory)
+ struct stat statbuf;
+ if (!stat(Directory,&statbuf))
+ {
+- chown(buf,statbuf.st_uid, statbuf.st_gid);
++ if (chown(buf,statbuf.st_uid, statbuf.st_gid)) {};
+ }
+ }
+
+diff --git a/command/marks.cpp b/command/marks.cpp
+index 6935175..67358fc 100644
+--- a/command/marks.cpp
++++ b/command/marks.cpp
+@@ -392,7 +392,7 @@ bool clMarks::Save(const char *Directory, double FrameRate, bool isTS)
+ struct stat statbuf;
+ if (!stat(spath,&statbuf))
+ {
+- chown(fpath,statbuf.st_uid, statbuf.st_gid);
++ if (chown(fpath,statbuf.st_uid, statbuf.st_gid)) {};
+ }
+ free(spath);
+ }
+diff --git a/command/video.cpp b/command/video.cpp
+index 2f75222..92c834d 100644
+--- a/command/video.cpp
++++ b/command/video.cpp
+@@ -66,7 +66,7 @@ int cMarkAdLogo::Load(char *directory, char *file)
+ free(path);
+ if (!pFile) return -1;
+
+- fscanf(pFile, "P5\n#C%i %i\n%d %d\n255\n#", &area.corner,&area.mpixel,&LOGOWIDTH,&LOGOHEIGHT);
++ if (fscanf(pFile, "P5\n#C%i %i\n%d %d\n255\n#", &area.corner,&area.mpixel,&LOGOWIDTH,&LOGOHEIGHT)) {};
+
+ if (LOGOHEIGHT==255)
+ {
+@@ -82,7 +82,7 @@ int cMarkAdLogo::Load(char *directory, char *file)
+ return -2;
+ }
+
+- fread(&area.mask,1,LOGOWIDTH*LOGOHEIGHT,pFile);
++ if (fread(&area.mask,1,LOGOWIDTH*LOGOHEIGHT,pFile)!=(size_t) (LOGOWIDTH*LOGOHEIGHT)) return -2;
+
+ if (!area.mpixel)
+ {
+@@ -121,7 +121,7 @@ void cMarkAdLogo::Save(int lastiframe, uchar *picture)
+ fprintf(pFile, "P5\n#C%i\n%d %d\n255\n", area.corner, LOGOWIDTH,LOGOHEIGHT);
+
+ // Write pixel data
+- fwrite(picture,1,LOGOWIDTH*LOGOHEIGHT,pFile);
++ if (fwrite(picture,1,LOGOWIDTH*LOGOHEIGHT,pFile)) {};
+ // Close file
+ fclose(pFile);
+ free(buf);
+--
+1.7.1
+
Modified: vdr/vdr-plugin-markad/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/patches/series?rev=8652&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/patches/series (original)
+++ vdr/vdr-plugin-markad/trunk/debian/patches/series Thu May 27 20:44:14 2010
@@ -1,1 +1,2 @@
0001-Fixed-errno-undeclared.patch
+0002-Fixed-some-compiler-warnings.patch
More information about the pkg-vdr-dvb-changes
mailing list