diff --git a/configure.ac b/configure.ac index 9539cbb1..764aa7e3 100644 --- a/configure.ac +++ b/configure.ac @@ -15,11 +15,11 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA dnl 02111-1307, USA. -define(RELEASE_NUM, 70) -define(CDIO_VERSION_STR, 0.$1) +define(RELEASE_NUM, 71) +define(CDIO_VERSION_STR, 0.$1cvs) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.93 2004/09/01 23:39:17 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.94 2004/09/03 23:20:11 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) AM_INIT_AUTOMAKE diff --git a/include/cdio/types.h b/include/cdio/types.h index 97f7a121..6609be61 100644 --- a/include/cdio/types.h +++ b/include/cdio/types.h @@ -1,5 +1,5 @@ /* - $Id: types.h,v 1.22 2004/08/06 00:55:14 rocky Exp $ + $Id: types.h,v 1.23 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -106,11 +106,11 @@ extern "C" { { false = 0, true = 1 - } _Bool; + } _cdio_Bool; # define false false # define true true -# define bool _Bool +# define bool _cdio_Bool # endif #endif diff --git a/lib/_cdio_bsdi.c b/lib/_cdio_bsdi.c index 796cb365..efd18eeb 100644 --- a/lib/_cdio_bsdi.c +++ b/lib/_cdio_bsdi.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_bsdi.c,v 1.41 2004/08/16 01:47:49 rocky Exp $ + $Id: _cdio_bsdi.c,v 1.42 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -27,8 +27,9 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.41 2004/08/16 01:47:49 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.42 2004/09/03 23:20:11 rocky Exp $"; +#include #include #include #include "cdio_assert.h" @@ -811,7 +812,7 @@ cdio_open_bsdi (const char *psz_orig_source) else { /* The below would be okay if all device drivers worked this way. */ #if 0 - cdio_info ("source %s is a not a device", psz_orig_source); + cdio_info ("source %s is not a device", psz_orig_source); #endif return NULL; } diff --git a/lib/_cdio_generic.c b/lib/_cdio_generic.c index 3e4f3b35..5397ff9d 100644 --- a/lib/_cdio_generic.c +++ b/lib/_cdio_generic.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_generic.c,v 1.25 2004/08/28 09:15:41 rocky Exp $ + $Id: _cdio_generic.c,v 1.26 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.25 2004/08/28 09:15:41 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.26 2004/09/03 23:20:11 rocky Exp $"; #include #include @@ -198,7 +198,8 @@ cdio_is_device_quiet_generic(const char *source_name) Use cdio_free_device_list() to free this device_list. */ void -cdio_add_device_list(char **device_list[], const char *drive, int *num_drives) +cdio_add_device_list(char **device_list[], const char *drive, + unsigned int *num_drives) { if (NULL != drive) { unsigned int j; diff --git a/lib/_cdio_linux.c b/lib/_cdio_linux.c index b26fe726..683bc639 100644 --- a/lib/_cdio_linux.c +++ b/lib/_cdio_linux.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_linux.c,v 1.96 2004/08/27 11:53:38 rocky Exp $ + $Id: _cdio_linux.c,v 1.97 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.96 2004/08/27 11:53:38 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.97 2004/09/03 23:20:11 rocky Exp $"; #include @@ -1154,7 +1154,9 @@ cdio_open_am_linux (const char *psz_orig_source, const char *access_mode) set_arg_linux(_data, "source", psz_orig_source); else { /* The below would be okay if all device drivers worked this way. */ - cdio_info ("source %s is a not a device", psz_orig_source); +#if 0 + cdio_info ("source %s is not a device", psz_orig_source); +#endif return NULL; } } diff --git a/lib/_cdio_osx.c b/lib/_cdio_osx.c index da8a1101..fad41023 100644 --- a/lib/_cdio_osx.c +++ b/lib/_cdio_osx.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_osx.c,v 1.68 2004/09/02 03:45:49 rocky Exp $ + $Id: _cdio_osx.c,v 1.69 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein from vcdimager code: @@ -34,8 +34,9 @@ #include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.68 2004/09/02 03:45:49 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.69 2004/09/03 23:20:11 rocky Exp $"; +#include #include #include #include "cdio_assert.h" diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c index 9ac4e841..abd21ac9 100644 --- a/lib/_cdio_sunos.c +++ b/lib/_cdio_sunos.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_sunos.c,v 1.74 2004/08/16 01:47:49 rocky Exp $ + $Id: _cdio_sunos.c,v 1.75 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -38,7 +38,7 @@ #ifdef HAVE_SOLARIS_CDROM -static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.74 2004/08/16 01:47:49 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.75 2004/09/03 23:20:11 rocky Exp $"; #ifdef HAVE_GLOB_H #include @@ -767,7 +767,7 @@ cdio_get_devices_solaris (void) char volpath[256]; struct stat st; char **drives = NULL; - int num_files=0; + unsigned int i_files=0; #ifdef HAVE_GLOB_H unsigned int i; glob_t globbuf; @@ -782,9 +782,9 @@ cdio_get_devices_solaris (void) if(S_ISDIR(st.st_mode)) { sprintf(volpath, "%s/s0", globbuf.gl_pathv[i]); if(stat(volpath, &st) == 0) - cdio_add_device_list(&drives, volpath, &num_files); + cdio_add_device_list(&drives, volpath, &i_files); }else - cdio_add_device_list(&drives, globbuf.gl_pathv[i], &num_files); + cdio_add_device_list(&drives, globbuf.gl_pathv[i], &i_files); } globfree(&globbuf); #else @@ -793,12 +793,12 @@ cdio_get_devices_solaris (void) if(S_ISDIR(st.st_mode)) { sprintf(volpath, "%s/s0", DEFAULT_CDIO_DEVICE); if(stat(volpath, &st) == 0) - cdio_add_device_list(&drives, volpath, &num_files); + cdio_add_device_list(&drives, volpath, &i_files); }else - cdio_add_device_list(&drives, DEFAULT_CDIO_DEVICE, &num_files); + cdio_add_device_list(&drives, DEFAULT_CDIO_DEVICE, &i_files); } #endif /*HAVE_GLOB_H*/ - cdio_add_device_list(&drives, NULL, &num_files); + cdio_add_device_list(&drives, NULL, &i_files); return drives; #endif /*HAVE_SOLARIS_CDROM*/ } @@ -828,34 +828,34 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode) _img_private_t *_data; char *psz_source; - cdio_funcs _funcs = { - .eject_media = eject_media_solaris, - .free = cdio_generic_free, - .get_arg = get_arg_solaris, - .get_cdtext = get_cdtext_generic, - .get_default_device = cdio_get_default_device_solaris, - .get_devices = cdio_get_devices_solaris, - .get_discmode = get_discmode_solaris, - .get_drive_cap = scsi_mmc_get_drive_cap_generic, - .get_first_track_num= get_first_track_num_generic, - .get_mcn = scsi_mmc_get_mcn_generic, - .get_num_tracks = get_num_tracks_generic, - .get_track_format = get_track_format_solaris, - .get_track_green = _cdio_get_track_green, - .get_track_lba = NULL, /* This could be implemented if need be. */ - .get_track_msf = _cdio_get_track_msf, - .lseek = cdio_generic_lseek, - .read = cdio_generic_read, - .read_audio_sectors = _read_audio_sectors_solaris, - .read_mode1_sector = _read_mode1_sector_solaris, - .read_mode1_sectors = _read_mode1_sectors_solaris, - .read_mode2_sector = _read_mode2_sector_solaris, - .read_mode2_sectors = _read_mode2_sectors_solaris, - .read_toc = read_toc_solaris, - .run_scsi_mmc_cmd = run_scsi_cmd_solaris, - .stat_size = _cdio_stat_size, - .set_arg = _set_arg_solaris - }; + cdio_funcs _funcs; + + _funcs.eject_media = eject_media_solaris; + _funcs.free = cdio_generic_free; + _funcs.get_arg = get_arg_solaris; + _funcs.get_cdtext = get_cdtext_generic; + _funcs.get_default_device = cdio_get_default_device_solaris; + _funcs.get_devices = cdio_get_devices_solaris; + _funcs.get_discmode = get_discmode_solaris; + _funcs.get_drive_cap = scsi_mmc_get_drive_cap_generic; + _funcs.get_first_track_num= get_first_track_num_generic; + _funcs.get_mcn = scsi_mmc_get_mcn_generic, + _funcs.get_num_tracks = get_num_tracks_generic; + _funcs.get_track_format = get_track_format_solaris; + _funcs.get_track_green = _cdio_get_track_green; + _funcs.get_track_lba = NULL; /* This could be implemented if need be. */ + _funcs.get_track_msf = _cdio_get_track_msf; + _funcs.lseek = cdio_generic_lseek; + _funcs.read = cdio_generic_read; + _funcs.read_audio_sectors = _read_audio_sectors_solaris; + _funcs.read_mode1_sector = _read_mode1_sector_solaris; + _funcs.read_mode1_sectors = _read_mode1_sectors_solaris; + _funcs.read_mode2_sector = _read_mode2_sector_solaris; + _funcs.read_mode2_sectors = _read_mode2_sectors_solaris; + _funcs.read_toc = read_toc_solaris; + _funcs.run_scsi_mmc_cmd = run_scsi_cmd_solaris; + _funcs.stat_size = _cdio_stat_size; + _funcs.set_arg = _set_arg_solaris; _data = _cdio_malloc (sizeof (_img_private_t)); @@ -877,7 +877,7 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode) else { /* The below would be okay if all device drivers worked this way. */ #if 0 - cdio_info ("source %s is a not a device", psz_orig_source); + cdio_info ("source %s is not a device", psz_orig_source); #endif return NULL; } diff --git a/lib/cdio.c b/lib/cdio.c index c59edca2..7d0cfef4 100644 --- a/lib/cdio.c +++ b/lib/cdio.c @@ -1,5 +1,5 @@ /* - $Id: cdio.c,v 1.72 2004/08/29 03:45:35 rocky Exp $ + $Id: cdio.c,v 1.73 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel @@ -39,7 +39,7 @@ #include #include "cdio_private.h" -static const char _rcsid[] = "$Id: cdio.c,v 1.72 2004/08/29 03:45:35 rocky Exp $"; +static const char _rcsid[] = "$Id: cdio.c,v 1.73 2004/09/03 23:20:11 rocky Exp $"; const char *track_format2str[6] = @@ -425,7 +425,7 @@ cdio_get_devices_with_cap_ret (/*out*/ char* search_devices[], { char **drives=search_devices; char **drives_ret=NULL; - int num_drives=0; + unsigned int i_drives=0; *p_driver_id = DRIVER_DEVICE; @@ -437,7 +437,7 @@ cdio_get_devices_with_cap_ret (/*out*/ char* search_devices[], char **d = drives; for( ; *d != NULL; d++ ) { - cdio_add_device_list(&drives_ret, *d, &num_drives); + cdio_add_device_list(&drives_ret, *d, &i_drives); } } else { cdio_fs_anal_t got_fs=0; @@ -461,14 +461,14 @@ cdio_get_devices_with_cap_ret (/*out*/ char* search_devices[], ? (got_fs & need_fs_ext) != 0 : (got_fs | ~need_fs_ext) == -1; if (doit) - cdio_add_device_list(&drives_ret, *d, &num_drives); + cdio_add_device_list(&drives_ret, *d, &i_drives); } cdio_destroy(cdio); } } } - cdio_add_device_list(&drives_ret, NULL, &num_drives); + cdio_add_device_list(&drives_ret, NULL, &i_drives); cdio_free_device_list(drives); free(drives); return drives_ret; diff --git a/lib/cdio_private.h b/lib/cdio_private.h index 99c3d773..8136a623 100644 --- a/lib/cdio_private.h +++ b/lib/cdio_private.h @@ -1,5 +1,5 @@ /* - $Id: cdio_private.h,v 1.41 2004/08/28 09:15:41 rocky Exp $ + $Id: cdio_private.h,v 1.42 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein @@ -306,7 +306,7 @@ extern "C" { Use cdio_free_device_list() to free this device_list. */ void cdio_add_device_list(char **device_list[], const char *drive, - int *num_drives); + unsigned int *i_drives); #ifdef __cplusplus } diff --git a/lib/cdtext.c b/lib/cdtext.c index 44a6fb47..d01cd649 100644 --- a/lib/cdtext.c +++ b/lib/cdtext.c @@ -1,5 +1,5 @@ /* - $Id: cdtext.c,v 1.8 2004/08/30 01:59:13 rocky Exp $ + $Id: cdtext.c,v 1.9 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2004 Rocky Bernstein toc reading routine adapted from cuetools @@ -149,7 +149,7 @@ cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext) */ bool cdtext_data_init(void *user_data, track_t i_first_track, - const unsigned char *wdata, + unsigned char *wdata, set_cdtext_field_fn_t set_cdtext_field_fn) { CDText_data_t *pdata; diff --git a/lib/cdtext_private.h b/lib/cdtext_private.h index a549d166..b48dc6af 100644 --- a/lib/cdtext_private.h +++ b/lib/cdtext_private.h @@ -1,5 +1,5 @@ /* - $Id: cdtext_private.h,v 1.4 2004/08/30 00:26:59 rocky Exp $ + $Id: cdtext_private.h,v 1.5 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -69,7 +69,7 @@ typedef void (*set_cdtext_field_fn_t) (void *user_data, track_t i_track, Internal routine to parse all CD-TEXT data retrieved. */ bool cdtext_data_init(void *user_data, track_t i_first_track, - const unsigned char *wdata, + unsigned char *wdata, set_cdtext_field_fn_t set_cdtext_field_fn); diff --git a/lib/image/bincue.c b/lib/image/bincue.c index 5fd972ba..d147fbea 100644 --- a/lib/image/bincue.c +++ b/lib/image/bincue.c @@ -1,5 +1,5 @@ /* - $Id: bincue.c,v 1.41 2004/08/16 02:04:08 rocky Exp $ + $Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2002, 2003, 2004 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel @@ -26,7 +26,7 @@ (*.cue). */ -static const char _rcsid[] = "$Id: bincue.c,v 1.41 2004/08/16 02:04:08 rocky Exp $"; +static const char _rcsid[] = "$Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp $"; #include "image.h" #include "cdio_assert.h" @@ -1140,64 +1140,64 @@ cdio_open_cue (const char *psz_cue_name) _img_private_t *_data; char *psz_bin_name; - cdio_funcs _funcs = { - .eject_media = _eject_media_image, - .free = _free_image, - .get_arg = _get_arg_image, - .get_cdtext = get_cdtext_generic, - .get_devices = cdio_get_devices_bincue, - .get_default_device = cdio_get_default_device_bincue, - .get_discmode = _get_discmode_image, - .get_drive_cap = _get_drive_cap_image, - .get_first_track_num= _get_first_track_num_image, - .get_mcn = _get_mcn_image, - .get_num_tracks = _get_num_tracks_image, - .get_track_format = _get_track_format_bincue, - .get_track_green = _get_track_green_bincue, - .get_track_lba = _get_lba_track_bincue, - .get_track_msf = _get_track_msf_image, - .lseek = _lseek_bincue, - .read = _read_bincue, - .read_audio_sectors = _read_audio_sectors_bincue, - .read_mode1_sector = _read_mode1_sector_bincue, - .read_mode1_sectors = _read_mode1_sectors_bincue, - .read_mode2_sector = _read_mode2_sector_bincue, - .read_mode2_sectors = _read_mode2_sectors_bincue, - .set_arg = _set_arg_image, - .stat_size = _stat_size_bincue - }; + cdio_funcs _funcs; - if (NULL == psz_cue_name) return NULL; - - _data = _cdio_malloc (sizeof (_img_private_t)); - _data->gen.init = false; - _data->psz_cue_name = NULL; - - ret = cdio_new ((void *)_data, &_funcs); - - if (ret == NULL) { - free(_data); - return NULL; - } - - psz_bin_name = cdio_is_cuefile(psz_cue_name); - - if (NULL == psz_bin_name) { - cdio_error ("source name %s is not recognized as a CUE file", - psz_cue_name); - } - - _set_arg_image (_data, "cue", psz_cue_name); - _set_arg_image (_data, "source", psz_bin_name); - free(psz_bin_name); - - if (_init_bincue(_data)) { - return ret; - } else { - _free_image(_data); - free(ret); - return NULL; - } + _funcs.eject_media = _eject_media_image; + _funcs.free = _free_image; + _funcs.get_arg = _get_arg_image; + _funcs.get_cdtext = get_cdtext_generic; + _funcs.get_devices = cdio_get_devices_bincue; + _funcs.get_default_device = cdio_get_default_device_bincue; + _funcs.get_discmode = _get_discmode_image; + _funcs.get_drive_cap = _get_drive_cap_image; + _funcs.get_first_track_num= _get_first_track_num_image; + _funcs.get_mcn = _get_mcn_image; + _funcs.get_num_tracks = _get_num_tracks_image; + _funcs.get_track_format = _get_track_format_bincue; + _funcs.get_track_green = _get_track_green_bincue; + _funcs.get_track_lba = _get_lba_track_bincue; + _funcs.get_track_msf = _get_track_msf_image; + _funcs.lseek = _lseek_bincue; + _funcs.read = _read_bincue; + _funcs.read_audio_sectors = _read_audio_sectors_bincue; + _funcs.read_mode1_sector = _read_mode1_sector_bincue; + _funcs.read_mode1_sectors = _read_mode1_sectors_bincue; + _funcs.read_mode2_sector = _read_mode2_sector_bincue; + _funcs.read_mode2_sectors = _read_mode2_sectors_bincue; + _funcs.set_arg = _set_arg_image; + _funcs.stat_size = _stat_size_bincue; + + if (NULL == psz_cue_name) return NULL; + + _data = _cdio_malloc (sizeof (_img_private_t)); + _data->gen.init = false; + _data->psz_cue_name = NULL; + + ret = cdio_new ((void *)_data, &_funcs); + + if (ret == NULL) { + free(_data); + return NULL; + } + + psz_bin_name = cdio_is_cuefile(psz_cue_name); + + if (NULL == psz_bin_name) { + cdio_error ("source name %s is not recognized as a CUE file", + psz_cue_name); + } + + _set_arg_image (_data, "cue", psz_cue_name); + _set_arg_image (_data, "source", psz_bin_name); + free(psz_bin_name); + + if (_init_bincue(_data)) { + return ret; + } else { + _free_image(_data); + free(ret); + return NULL; + } } bool diff --git a/lib/image/cdrdao.c b/lib/image/cdrdao.c index 8bbd3f3c..e525bbc6 100644 --- a/lib/image/cdrdao.c +++ b/lib/image/cdrdao.c @@ -1,5 +1,5 @@ /* - $Id: cdrdao.c,v 1.26 2004/08/16 02:04:08 rocky Exp $ + $Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2004 Rocky Bernstein toc reading routine adapted from cuetools @@ -25,7 +25,7 @@ (*.cue). */ -static const char _rcsid[] = "$Id: cdrdao.c,v 1.26 2004/08/16 02:04:08 rocky Exp $"; +static const char _rcsid[] = "$Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp $"; #include "image.h" #include "cdio_assert.h" @@ -1124,33 +1124,33 @@ cdio_open_cdrdao (const char *psz_cue_name) CdIo *ret; _img_private_t *_data; - cdio_funcs _funcs = { - .eject_media = _eject_media_image, - .free = _free_image, - .get_arg = _get_arg_image, - .get_cdtext = get_cdtext_generic, - .get_devices = cdio_get_devices_cdrdao, - .get_default_device = cdio_get_default_device_cdrdao, - .get_discmode = _get_discmode_image, - .get_drive_cap = _get_drive_cap_image, - .get_first_track_num= _get_first_track_num_image, - .get_mcn = _get_mcn_image, - .get_num_tracks = _get_num_tracks_image, - .get_track_format = _get_track_format_cdrdao, - .get_track_green = _get_track_green_cdrdao, - .get_track_lba = _get_lba_track_cdrdao, - .get_track_msf = _get_track_msf_image, - .lseek = _lseek_cdrdao, - .read = _read_cdrdao, - .read_audio_sectors = _read_audio_sectors_cdrdao, - .read_mode1_sector = _read_mode1_sector_cdrdao, - .read_mode1_sectors = _read_mode1_sectors_cdrdao, - .read_mode2_sector = _read_mode2_sector_cdrdao, - .read_mode2_sectors = _read_mode2_sectors_cdrdao, - .set_arg = _set_arg_image, - .stat_size = _stat_size_cdrdao - }; + cdio_funcs _funcs; + _funcs.eject_media = _eject_media_image; + _funcs.free = _free_image; + _funcs.get_arg = _get_arg_image; + _funcs.get_cdtext = get_cdtext_generic; + _funcs.get_devices = cdio_get_devices_cdrdao; + _funcs.get_default_device = cdio_get_default_device_cdrdao; + _funcs.get_discmode = _get_discmode_image; + _funcs.get_drive_cap = _get_drive_cap_image; + _funcs.get_first_track_num= _get_first_track_num_image; + _funcs.get_mcn = _get_mcn_image; + _funcs.get_num_tracks = _get_num_tracks_image; + _funcs.get_track_format = _get_track_format_cdrdao; + _funcs.get_track_green = _get_track_green_cdrdao; + _funcs.get_track_lba = _get_lba_track_cdrdao; + _funcs.get_track_msf = _get_track_msf_image; + _funcs.lseek = _lseek_cdrdao; + _funcs.read = _read_cdrdao; + _funcs.read_audio_sectors = _read_audio_sectors_cdrdao; + _funcs.read_mode1_sector = _read_mode1_sector_cdrdao; + _funcs.read_mode1_sectors = _read_mode1_sectors_cdrdao; + _funcs.read_mode2_sector = _read_mode2_sector_cdrdao; + _funcs.read_mode2_sectors = _read_mode2_sectors_cdrdao; + _funcs.set_arg = _set_arg_image; + _funcs.stat_size = _stat_size_cdrdao; + if (NULL == psz_cue_name) return NULL; _data = _cdio_malloc (sizeof (_img_private_t)); diff --git a/lib/image/nrg.c b/lib/image/nrg.c index 0dab569e..8e2752bb 100644 --- a/lib/image/nrg.c +++ b/lib/image/nrg.c @@ -1,5 +1,5 @@ /* - $Id: nrg.c,v 1.38 2004/08/16 02:04:08 rocky Exp $ + $Id: nrg.c,v 1.39 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein Copyright (C) 2001, 2003 Herbert Valerio Riedel @@ -45,7 +45,7 @@ #include "_cdio_stdio.h" #include "nrg.h" -static const char _rcsid[] = "$Id: nrg.c,v 1.38 2004/08/16 02:04:08 rocky Exp $"; +static const char _rcsid[] = "$Id: nrg.c,v 1.39 2004/09/03 23:20:11 rocky Exp $"; /* reader */ @@ -1185,32 +1185,32 @@ cdio_open_nrg (const char *psz_source) CdIo *ret; _img_private_t *_data; - cdio_funcs _funcs = { - .eject_media = _eject_media_nrg, - .free = _free_nrg, - .get_arg = _get_arg_image, - .get_cdtext = get_cdtext_generic, - .get_devices = cdio_get_devices_nrg, - .get_default_device = cdio_get_default_device_nrg, - .get_discmode = _get_discmode_image, - .get_drive_cap = _get_drive_cap_image, - .get_first_track_num= _get_first_track_num_image, - .get_mcn = _get_mcn_image, - .get_num_tracks = _get_num_tracks_image, - .get_track_format = _get_track_format_nrg, - .get_track_green = _get_track_green_nrg, - .get_track_lba = NULL, /* Will use generic routine via msf */ - .get_track_msf = _get_track_msf_image, - .lseek = _lseek_nrg, - .read = _read_nrg, - .read_audio_sectors = _read_audio_sectors_nrg, - .read_mode1_sector = _read_mode1_sector_nrg, - .read_mode1_sectors = _read_mode1_sectors_nrg, - .read_mode2_sector = _read_mode2_sector_nrg, - .read_mode2_sectors = _read_mode2_sectors_nrg, - .set_arg = _set_arg_image, - .stat_size = _stat_size_nrg, - }; + cdio_funcs _funcs; + + _funcs.eject_media = _eject_media_nrg; + _funcs.free = _free_nrg; + _funcs.get_arg = _get_arg_image; + _funcs.get_cdtext = get_cdtext_generic; + _funcs.get_devices = cdio_get_devices_nrg; + _funcs.get_default_device = cdio_get_default_device_nrg; + _funcs.get_discmode = _get_discmode_image; + _funcs.get_drive_cap = _get_drive_cap_image; + _funcs.get_first_track_num= _get_first_track_num_image; + _funcs.get_mcn = _get_mcn_image; + _funcs.get_num_tracks = _get_num_tracks_image; + _funcs.get_track_format = _get_track_format_nrg; + _funcs.get_track_green = _get_track_green_nrg; + _funcs.get_track_lba = NULL; /* Will use generic routine via msf */ + _funcs.get_track_msf = _get_track_msf_image; + _funcs.lseek = _lseek_nrg; + _funcs.read = _read_nrg; + _funcs.read_audio_sectors = _read_audio_sectors_nrg; + _funcs.read_mode1_sector = _read_mode1_sector_nrg; + _funcs.read_mode1_sectors = _read_mode1_sectors_nrg; + _funcs.read_mode2_sector = _read_mode2_sector_nrg; + _funcs.read_mode2_sectors = _read_mode2_sectors_nrg; + _funcs.set_arg = _set_arg_image; + _funcs.stat_size = _stat_size_nrg; _data = _cdio_malloc (sizeof (_img_private_t)); _data->gen.init = false; diff --git a/lib/scsi_mmc.c b/lib/scsi_mmc.c index b31f1eda..8a7e08a8 100644 --- a/lib/scsi_mmc.c +++ b/lib/scsi_mmc.c @@ -1,6 +1,6 @@ /* Common SCSI Multimedia Command (MMC) routines. - $Id: scsi_mmc.c,v 1.27 2004/08/27 11:53:38 rocky Exp $ + $Id: scsi_mmc.c,v 1.28 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -527,7 +527,7 @@ scsi_mmc_init_cdtext_private ( void *p_user_data, generic_img_private_t *p_env = p_user_data; scsi_mmc_cdb_t cdb = {{0, }}; - char wdata[5000] = { 0, }; + unsigned char wdata[5000] = { 0, }; int i_status; if ( ! p_env || ! run_scsi_mmc_cmd || p_env->b_cdtext_error ) diff --git a/lib/sector.c b/lib/sector.c index eb565455..e3bf6671 100644 --- a/lib/sector.c +++ b/lib/sector.c @@ -1,5 +1,5 @@ /* - $Id: sector.c,v 1.13 2004/07/25 18:37:09 rocky Exp $ + $Id: sector.c,v 1.14 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2004 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel @@ -35,7 +35,7 @@ #include -static const char _rcsid[] = "$Id: sector.c,v 1.13 2004/07/25 18:37:09 rocky Exp $"; +static const char _rcsid[] = "$Id: sector.c,v 1.14 2004/09/03 23:20:11 rocky Exp $"; lba_t cdio_lba_to_lsn (lba_t lba) @@ -90,7 +90,8 @@ cdio_lba_to_msf_str (lba_t lba) if (CDIO_INVALID_LBA == lba) { return strdup("*INVALID"); } else { - msf_t msf = { .m = 0, .s = 0, .f = 0 }; + msf_t msf; + msf.m = msf.s = msf.f = 0; cdio_lba_to_msf (lba, &msf); return cdio_msf_to_str(&msf); } diff --git a/lib/util.c b/lib/util.c index c6e8678c..e99ece7e 100644 --- a/lib/util.c +++ b/lib/util.c @@ -1,8 +1,8 @@ /* - $Id: util.c,v 1.4 2004/07/27 18:57:04 rocky Exp $ + $Id: util.c,v 1.5 2004/09/03 23:20:11 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel - Copyright (C) 2003 Rocky Bernstein + Copyright (C) 2003, 2004 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,9 +33,10 @@ #endif #include "cdio_assert.h" +#include #include -static const char _rcsid[] = "$Id: util.c,v 1.4 2004/07/27 18:57:04 rocky Exp $"; +static const char _rcsid[] = "$Id: util.c,v 1.5 2004/09/03 23:20:11 rocky Exp $"; size_t _cdio_strlenv(char **str_array)