claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate open on CD. Some warnings turned into info

Browse Source 
messages. Remove unnecessary \n's.
This commit is contained in:
rocky
2005-03-15 12:11:53 +00:00
parent 6d9fdf7cd5
commit af71247d66
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/driver/gnu_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: gnu_linux.c,v 1.9 2005/03/15 04:16:17 rocky Exp $ $Id: gnu_linux.c,v 1.10 2005/03/15 12:11:53 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: gnu_linux.c,v 1.9 2005/03/15 04:16:17 rocky Exp $"; static const char _rcsid[] = "$Id: gnu_linux.c,v 1.10 2005/03/15 12:11:53 rocky Exp $";
#include <string.h> #include <string.h>
@@ -568,43 +568,43 @@ eject_media_linux (void *p_user_data) {
_img_private_t *p_env = p_user_data; _img_private_t *p_env = p_user_data;
driver_return_code_t ret=DRIVER_OP_SUCCESS; driver_return_code_t ret=DRIVER_OP_SUCCESS;
int status; int status;
int fd;
if ((fd = open (p_env->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) { if ( p_env->gen.fd <= -1 ) {
if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) { p_env->gen.fd = open (p_env->gen.source_name, O_RDONLY|O_NONBLOCK);
switch(status) { }
case CDS_TRAY_OPEN:
if((ret = ioctl(fd, CDROMCLOSETRAY)) != 0) { if ( p_env->gen.fd <= -1 ) return DRIVER_OP_ERROR;
cdio_warn ("ioctl CDROMCLOSETRAY failed: %s\n", strerror(errno));
ret = DRIVER_OP_ERROR; if ((status = ioctl(p_env->gen.fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
} switch(status) {
break; case CDS_TRAY_OPEN:
case CDS_DISC_OK: if((ret = ioctl(p_env->gen.fd, CDROMCLOSETRAY)) != 0) {
if((ret = ioctl(fd, CDROMEJECT)) != 0) { cdio_warn ("ioctl CDROMCLOSETRAY failed: %s\n", strerror(errno));
int eject_error = errno; ret = DRIVER_OP_ERROR;
/* Try ejecting the MMC way... */
ret = mmc_eject_media(p_env->gen.cdio);
if (0 != ret) {
cdio_warn("ioctl CDROMEJECT failed: %s\n",
strerror(eject_error));
ret = DRIVER_OP_ERROR;
}
}
/* force kernel to reread partition table when new disc inserted */
ret = ioctl(p_env->gen.fd, BLKRRPART);
break;
default:
cdio_warn ("Unknown CD-ROM (%d)\n", status);
ret = DRIVER_OP_ERROR;
} }
} else { break;
cdio_warn ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno)); case CDS_DISC_OK:
ret=DRIVER_OP_ERROR; if((ret = ioctl(p_env->gen.fd, CDROMEJECT)) != 0) {
int eject_error = errno;
/* Try ejecting the MMC way... */
ret = mmc_eject_media(p_env->gen.cdio);
if (0 != ret) {
cdio_info("ioctl CDROMEJECT and MMC eject failed: %s",
strerror(eject_error));
ret = DRIVER_OP_ERROR;
}
}
/* force kernel to reread partition table when new disc inserted */
ret = ioctl(p_env->gen.fd, BLKRRPART);
break;
default:
cdio_warn ("Unknown CD-ROM (%d)\n", status);
ret = DRIVER_OP_ERROR;
} }
close(fd); } else {
} else cdio_warn ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
ret = DRIVER_OP_ERROR; ret=DRIVER_OP_ERROR;
close(p_env->gen.fd); }
p_env->gen.fd = -1; p_env->gen.fd = -1;
return ret; return ret;
} }
@@ -1096,7 +1096,7 @@ run_mmc_cmd_linux( void *p_user_data,
int i_rc = ioctl (p_env->gen.fd, CDROM_SEND_PACKET, &cgc); int i_rc = ioctl (p_env->gen.fd, CDROM_SEND_PACKET, &cgc);
if (0 == i_rc) return DRIVER_OP_SUCCESS; if (0 == i_rc) return DRIVER_OP_SUCCESS;
if (-1 == i_rc) { if (-1 == i_rc) {
cdio_warn ("ioctl CDROM_SEND_PACKET failed: %s\n", strerror(errno)); cdio_info ("ioctl CDROM_SEND_PACKET failed: %s", strerror(errno));
switch (errno) { switch (errno) {
case EPERM: case EPERM:
return DRIVER_OP_NOT_PERMITTED; return DRIVER_OP_NOT_PERMITTED;