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

add _t to another time. driver_id inside p_cdio wasn't initialized.

Browse Source
This commit is contained in:
rocky
2005-01-17 17:20:09 +00:00
parent 8c8c08aa67
commit 17c55ea59b
13 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/driver/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.4 2005/01/04 04:33:36 rocky Exp $
$Id: bincue.c,v 1.5 2005/01/17 17:20:09 rocky Exp $
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.4 2005/01/04 04:33:36 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.5 2005/01/17 17:20:09 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -1093,7 +1093,7 @@ cdio_is_binfile(const char *psz_bin_name)
get called via a function pointer. In fact *we* are the
ones to set that up.
*/
CdIo *
CdIo_t *
cdio_open_am_bincue (const char *psz_source_name, const char *psz_access_mode)
{
if (psz_access_mode != NULL)
@@ -1107,7 +1107,7 @@ cdio_open_am_bincue (const char *psz_source_name, const char *psz_access_mode)
get called via a function pointer. In fact *we* are the
ones to set that up.
*/
CdIo *
CdIo_t *
cdio_open_bincue (const char *source_name)
{
char *psz_bin_name = cdio_is_cuefile(source_name);
@@ -1123,15 +1123,15 @@ cdio_open_bincue (const char *source_name)
}
}
CdIo *
CdIo_t *
cdio_open_cue (const char *psz_cue_name)
{
CdIo *ret;
CdIo_t *ret;
_img_private_t *_data;
char *psz_bin_name;
cdio_funcs _funcs;
cdio_funcs_t _funcs;
memset( &_funcs, 0, sizeof(_funcs) );
_funcs.eject_media = _eject_media_image;
@@ -1176,6 +1176,7 @@ cdio_open_cue (const char *psz_cue_name)
return NULL;
}
ret->driver_id = DRIVER_BINCUE;
psz_bin_name = cdio_is_cuefile(psz_cue_name);
if (NULL == psz_bin_name) {

7
lib/driver/image/cdrdao.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdrdao.c,v 1.5 2005/01/16 04:28:02 rocky Exp $
$Id: cdrdao.c,v 1.6 2005/01/17 17:20:09 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: cdrdao.c,v 1.5 2005/01/16 04:28:02 rocky Exp $";
static const char _rcsid[] = "$Id: cdrdao.c,v 1.6 2005/01/17 17:20:09 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -1172,7 +1172,7 @@ cdio_open_cdrdao (const char *psz_cue_name)
CdIo *ret;
_img_private_t *_data;
cdio_funcs _funcs;
cdio_funcs_t _funcs;
memset( &_funcs, 0, sizeof(_funcs) );
@@ -1220,6 +1220,7 @@ cdio_open_cdrdao (const char *psz_cue_name)
return NULL;
}
ret->driver_id = DRIVER_CDRDAO;
if (!cdio_is_tocfile(psz_cue_name)) {
cdio_debug ("source name %s is not recognized as a TOC file",
psz_cue_name);

7
lib/driver/image/nrg.c
View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.6 2005/01/12 11:34:52 rocky Exp $
$Id: nrg.c,v 1.7 2005/01/17 17:20:09 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -46,7 +46,7 @@
#include "_cdio_stdio.h"
#include "nrg.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.6 2005/01/12 11:34:52 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.7 2005/01/17 17:20:09 rocky Exp $";
/* reader */
@@ -1200,7 +1200,7 @@ cdio_open_nrg (const char *psz_source)
CdIo *ret;
_img_private_t *_data;
cdio_funcs _funcs;
cdio_funcs_t _funcs;
memset( &_funcs, 0, sizeof(_funcs) );
@@ -1250,6 +1250,7 @@ cdio_open_nrg (const char *psz_source)
return NULL;
}
ret->driver_id = DRIVER_NRG;
_set_arg_image(_data, "source", (NULL == psz_source)
? DEFAULT_CDIO_DEVICE: psz_source);
_set_arg_image (_data, "access-mode", "Nero");