[xine-cvs] CVS: xine-lib/src/input input_mms.c,1.59,1.60 input_pnm.c,1.23,1.24 input_rtsp.c,1.20,1.21 input_vcd.c,1.82,1.83 media_helper.c,1.9,1.10

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18164/src/input

Modified Files:
	input_mms.c input_pnm.c input_rtsp.c input_vcd.c 
	media_helper.c 
Log Message:
1) various warning fixes
2) [coverity] fixes:
  - 279 (w32): test should be on input parametr type, not typeW
  - 267 (aout): can be ignored but there was warning anyway
  - 234 (w32): missing free on error & exit
  - 152 (w32): missing free on error & exit
  - 148 (w32): fixed bound of static array in test
  - 101 (ffdec): defense code when avodec_encode_video will fail (just defense to the future,
         should never happen with current ffmpeg in xine)
  - 98, 99 (w32): check negative handle by _x_assert (it's used as index to array)
  - 90 (w32): negate pointer check (+added check for size)
  - 89 (w32): added NULL and size check


Index: input_mms.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_mms.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- input_mms.c	25 Mar 2006 11:59:29 -0000	1.59
+++ input_mms.c	5 Apr 2006 22:12:19 -0000	1.60
@@ -55,10 +55,6 @@
 #define PROTOCOL_MMST      1
 #define PROTOCOL_MMSH      2
 
-#if !defined(NDELAY) && defined(O_NDELAY)
-#define FNDELAY O_NDELAY
-#endif
-
 /* network bandwidth */
 const uint32_t mms_bandwidths[]={14400,19200,28800,33600,34430,57600,
                                   115200,262200,393216,524300,1544000,10485800};

Index: input_pnm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_pnm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- input_pnm.c	14 Oct 2005 21:02:16 -0000	1.23
+++ input_pnm.c	5 Apr 2006 22:12:19 -0000	1.24
@@ -50,10 +50,6 @@
 
 #define BUFSIZE 4096
 
-#if !defined(NDELAY) && defined(O_NDELAY)
-#define FNDELAY O_NDELAY
-#endif
-
 typedef struct {
 
   input_class_t     input_class;

Index: input_rtsp.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_rtsp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- input_rtsp.c	14 Oct 2005 21:02:16 -0000	1.20
+++ input_rtsp.c	5 Apr 2006 22:12:19 -0000	1.21
@@ -50,10 +50,6 @@
 
 #define BUFSIZE 1025
 
-#if !defined(NDELAY) && defined(O_NDELAY)
-#define FNDELAY O_NDELAY
-#endif
-
 typedef struct {
 
   input_class_t     input_class;

Index: input_vcd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_vcd.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- input_vcd.c	29 Mar 2006 21:00:45 -0000	1.82
+++ input_vcd.c	5 Apr 2006 22:12:19 -0000	1.83
@@ -623,6 +623,7 @@
 }
 #endif
 
+#if defined (__linux__) || defined(__sun) || defined(HOST_OS_DARWIN)
 static off_t vcd_time_to_offset (int min, int sec, int frame) {
   return min * 60 * 75 + sec * 75 + frame;
 }
@@ -637,7 +638,6 @@
 
 }
 
-#if defined (__linux__) || defined(__sun) || defined(HOST_OS_DARWIN)
 static off_t vcd_plugin_seek (input_plugin_t *this_gen, 
 			      off_t offset, int origin) {
 

Index: media_helper.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/media_helper.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- media_helper.c	2 Sep 2004 19:56:42 -0000	1.9
+++ media_helper.c	5 Apr 2006 22:12:19 -0000	1.10
@@ -93,7 +93,7 @@
 
 #else 
 
-  int ret, status, fd;
+  int fd;
 
   /* printf("input_dvd: Eject Device %s current device %s opened=%d handle=%p trying...\n",device, this->current_dvd_device, this->opened, this->dvdnav); */
   media_umount_media(device);
@@ -102,6 +102,7 @@
   if ((fd = open (device, O_RDONLY|O_NONBLOCK)) > -1) {
 
 #if defined (__linux__)
+    int ret, status;
 
     if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
       switch(status) {