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

iso9660_fs.c: wrong order of initialization.

Browse Source 
correct types on get_media_changed_mmc
Solaris fixes.
This commit is contained in:
rocky
2005-02-06 11:32:22 +00:00
parent 71a71d7f56
commit 12186bc043
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/version.texi
View File

@@ -1,4 +1,4 @@
@set UPDATED 5 February 2005 @set UPDATED 6 February 2005
@set UPDATED-MONTH February 2005 @set UPDATED-MONTH February 2005
@set EDITION 0.73cvs @set EDITION 0.73cvs
@set VERSION 0.73cvs @set VERSION 0.73cvs

11
lib/driver/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.19 2005/02/06 11:13:37 rocky Exp $ $Id: _cdio_sunos.c,v 1.20 2005/02/06 11:32:22 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>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.19 2005/02/06 11:13:37 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.20 2005/02/06 11:32:22 rocky Exp $";
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>
@@ -145,9 +145,9 @@ init_solaris (_img_private_t *p_env)
p_buf Buffer for data, both sending and receiving p_buf Buffer for data, both sending and receiving
*/ */
static driver_return_code_t static driver_return_code_t
run_scsi_cmd_solaris( void *p_user_data, unsigned int i_timeout_ms, run_mmc_cmd_solaris( void *p_user_data, unsigned int i_timeout_ms,
unsigned int i_cdb, const mmc_cdb_t *p_cdb, unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
mmc_direction_t e_direction, scsi_mmc_direction_t e_direction,
unsigned int i_buf, /*in/out*/ void *p_buf ) unsigned int i_buf, /*in/out*/ void *p_buf )
{ {
const _img_private_t *p_env = p_user_data; const _img_private_t *p_env = p_user_data;
@@ -855,6 +855,7 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode)
_funcs.get_drive_cap = get_drive_cap_mmc; _funcs.get_drive_cap = get_drive_cap_mmc;
_funcs.get_first_track_num = get_first_track_num_generic; _funcs.get_first_track_num = get_first_track_num_generic;
_funcs.get_hwinfo = NULL; _funcs.get_hwinfo = NULL;
_funcs.get_media_changed = get_media_changed_mmc,
_funcs.get_mcn = get_mcn_mmc, _funcs.get_mcn = get_mcn_mmc,
_funcs.get_num_tracks = get_num_tracks_generic; _funcs.get_num_tracks = get_num_tracks_generic;
_funcs.get_track_channels = get_track_channels_generic, _funcs.get_track_channels = get_track_channels_generic,

4
lib/driver/cdio_private.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio_private.h,v 1.13 2005/02/06 11:13:37 rocky Exp $ $Id: cdio_private.h,v 1.14 2005/02/06 11:32:22 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -150,7 +150,7 @@ extern "C" {
@return 1 if media has changed since last call, 0 if not. Error @return 1 if media has changed since last call, 0 if not. Error
return codes are the same as driver_return_code_t return codes are the same as driver_return_code_t
*/ */
int (*get_media_changed) (void *p_env); int (*get_media_changed) (const void *p_env);
/*! /*!
Return the media catalog number MCN from the CD or NULL if Return the media catalog number MCN from the CD or NULL if

4
lib/driver/image_common.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: image_common.c,v 1.8 2005/02/06 11:13:37 rocky Exp $ $Id: image_common.c,v 1.9 2005/02/06 11:32:22 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -154,7 +154,7 @@ _get_first_track_num_image(void *p_user_data)
We always return DRIVER_OP_UNSUPPORTED. We always return DRIVER_OP_UNSUPPORTED.
*/ */
int int
get_media_changed_image(void *p_user_data) get_media_changed_image(const void *p_user_data)
{ {
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }

4
lib/driver/image_common.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: image_common.h,v 1.7 2005/02/06 11:13:37 rocky Exp $ $Id: image_common.h,v 1.8 2005/02/06 11:32:22 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -106,7 +106,7 @@ track_t _get_first_track_num_image(void *p_user_data);
return codes are the same as driver_return_code_t return codes are the same as driver_return_code_t
We always return DRIVER_OP_UNSUPPORTED. We always return DRIVER_OP_UNSUPPORTED.
*/ */
int get_media_changed_image(void *p_user_data); int get_media_changed_image(const void *p_user_data);
/*! /*!
Return the media catalog number (MCN) from the CD or NULL if there Return the media catalog number (MCN) from the CD or NULL if there

7
lib/iso9660/iso9660_fs.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: iso9660_fs.c,v 1.9 2005/02/05 18:58:36 rocky Exp $ $Id: iso9660_fs.c,v 1.10 2005/02/06 11:32:22 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -58,7 +58,7 @@ typedef enum {
} bool_3way_t; } bool_3way_t;
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.9 2005/02/05 18:58:36 rocky Exp $"; static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.10 2005/02/06 11:32:22 rocky Exp $";
/* Implementation of iso9660_t type */ /* Implementation of iso9660_t type */
struct _iso9660 { struct _iso9660 {
@@ -1220,11 +1220,12 @@ iso9660_fs_stat (CdIo_t *p_cdio, const char psz_path[])
if (!p_cdio) return NULL; if (!p_cdio) return NULL;
if (!psz_path) return NULL; if (!psz_path) return NULL;
if (!p_root) return NULL;
b_mode2 = cdio_get_track_green(p_cdio, 1); b_mode2 = cdio_get_track_green(p_cdio, 1);
p_root = _fs_stat_root (p_cdio); p_root = _fs_stat_root (p_cdio);
if (!p_root) return NULL;
switch(cdio_get_discmode(p_cdio)) { switch(cdio_get_discmode(p_cdio)) {
case CDIO_DISC_MODE_CD_XA: case CDIO_DISC_MODE_CD_XA:
b_xa = yep; b_xa = yep;