diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-04-05 22:12:17 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-04-05 22:12:17 +0000 |
| commit | 639bd610bfcb1a028b91a5c3d125045c8de6d8b7 (patch) | |
| tree | 6247df0c3a36b4a8eb11e0a764ff3e99632a619b /src/input/media_helper.c | |
| parent | 22924ef0924502e0d9b1652651d40270602ee7a0 (diff) | |
| download | xine-lib-639bd610bfcb1a028b91a5c3d125045c8de6d8b7.tar.gz xine-lib-639bd610bfcb1a028b91a5c3d125045c8de6d8b7.tar.bz2 | |
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
Diffstat (limited to 'src/input/media_helper.c')
| -rw-r--r-- | src/input/media_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |