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

Don't terminate on error but just return a failure and let the

Browse Source 
caller decide to exit or not.
This commit is contained in:
rocky
2004-06-25 20:49:56 +00:00
parent 805ce0d9ee
commit 3ca533663d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/FreeBSD/freebsd.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: freebsd.c,v 1.22 2004/06/19 16:34:45 rocky Exp $ $Id: freebsd.c,v 1.23 2004/06/25 20:49:56 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: freebsd.c,v 1.22 2004/06/19 16:34:45 rocky Exp $"; static const char _rcsid[] = "$Id: freebsd.c,v 1.23 2004/06/25 20:49:56 rocky Exp $";
#include "freebsd.h" #include "freebsd.h"
@@ -192,7 +192,7 @@ _cdio_read_toc (_img_private_t *env)
/* read TOC header */ /* read TOC header */
if ( ioctl(env->gen.fd, CDIOREADTOCHEADER, &env->tochdr) == -1 ) { if ( ioctl(env->gen.fd, CDIOREADTOCHEADER, &env->tochdr) == -1 ) {
cdio_error("error in ioctl(CDIOREADTOCHEADER): %s\n", strerror(errno)); cdio_warn("error in ioctl(CDIOREADTOCHEADER): %s\n", strerror(errno));
return false; return false;
} }
@@ -203,7 +203,7 @@ _cdio_read_toc (_img_private_t *env)
env->tocent[j].address_format = CD_LBA_FORMAT; env->tocent[j].address_format = CD_LBA_FORMAT;
if ( ioctl(env->gen.fd, CDIOREADTOCENTRY, &(env->tocent[j]) ) ) { if ( ioctl(env->gen.fd, CDIOREADTOCENTRY, &(env->tocent[j]) ) ) {
cdio_error("%s %d: %s\n", cdio_warn("%s %d: %s\n",
"error in ioctl CDROMREADTOCENTRY for track", "error in ioctl CDROMREADTOCENTRY for track",
i, strerror(errno)); i, strerror(errno));
return false; return false;
@@ -213,7 +213,7 @@ _cdio_read_toc (_img_private_t *env)
env->tocent[j].track = CDIO_CDROM_LEADOUT_TRACK; env->tocent[j].track = CDIO_CDROM_LEADOUT_TRACK;
env->tocent[j].address_format = CD_LBA_FORMAT; env->tocent[j].address_format = CD_LBA_FORMAT;
if ( ioctl(env->gen.fd, CDIOREADTOCENTRY, &(env->tocent[j]) ) ){ if ( ioctl(env->gen.fd, CDIOREADTOCENTRY, &(env->tocent[j]) ) ){
cdio_error("%s: %s\n", cdio_warn("%s: %s\n",
"error in ioctl CDROMREADTOCENTRY for leadout track", "error in ioctl CDROMREADTOCENTRY for leadout track",
strerror(errno)); strerror(errno));
return false; return false;

10
lib/FreeBSD/freebsd_cam.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: freebsd_cam.c,v 1.12 2004/06/19 16:34:45 rocky Exp $ $Id: freebsd_cam.c,v 1.13 2004/06/25 20:49:56 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.12 2004/06/19 16:34:45 rocky Exp $"; static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.13 2004/06/25 20:49:56 rocky Exp $";
#ifdef HAVE_FREEBSD_CDROM #ifdef HAVE_FREEBSD_CDROM
@@ -55,7 +55,7 @@ _scsi_cmd (_img_private_t * env)
retval = -1; retval = -1;
else else
CREAM_ON_ERRNO(((unsigned char *)&env->ccb.csio.sense_data)); CREAM_ON_ERRNO(((unsigned char *)&env->ccb.csio.sense_data));
cdio_error ("transport failed: ", retval); cdio_warn ("transport failed: ", retval);
return retval; return retval;
} }
@@ -73,13 +73,13 @@ init_freebsd_cam (_img_private_t *env)
if (env->gen.fd < 0) if (env->gen.fd < 0)
{ {
cdio_error ("open (%s): %s", env->device, strerror (errno)); cdio_warn ("open (%s): %s", env->device, strerror (errno));
return false; return false;
} }
if (ioctl (env->gen.fd, CAMGETPASSTHRU, &env->ccb) < 0) if (ioctl (env->gen.fd, CAMGETPASSTHRU, &env->ccb) < 0)
{ {
cdio_error ("open: %s", strerror (errno)); cdio_warn ("open: %s", strerror (errno));
return false; return false;
} }
sprintf (pass,"/dev/%.15s%u", sprintf (pass,"/dev/%.15s%u",