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

CVS patchset: 7959
CVS date: 2006/04/05 22:12:17

5 files changed, 5 insertions, 16 deletions

diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 7ba14765b..4cc7e73e7 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_mms.c,v 1.59 2006/03/25 11:59:29 hadess Exp $
+ * $Id: input_mms.c,v 1.60 2006/04/05 22:12:19 valtri Exp $
  *
  * mms input plugin based on work from major mms
  */
@@ -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};
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 6e93cffad..7d1cddbd7 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -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;
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 47e8a9654..947d9b146 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -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;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 42c183fb7..ab4f004b1 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_vcd.c,v 1.82 2006/03/29 21:00:45 valtri Exp $
+ * $Id: input_vcd.c,v 1.83 2006/04/05 22:12:19 valtri Exp $
  *
  */
 
@@ -623,6 +623,7 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen,
 }
 #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 @@ static void vcd_offset_to_time (off_t offset, uint8_t *min, uint8_t *sec,
 
 }
 
-#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) {
 
diff --git a/src/input/media_helper.c b/src/input/media_helper.c
index 2c61cdb6a..da30783b0 100644
--- a/src/input/media_helper.c
+++ b/src/input/media_helper.c
@@ -93,7 +93,7 @@ int media_eject_media (xine_t *xine, const char *device)
 
 #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 @@ int media_eject_media (xine_t *xine, const char *device)
   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) {