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

configure.ac: now in 0.71cvs

Browse Source 
*.c: lint-like changes. Tested on Sun's SUNPRO cc compiler.
     Removed feild initialization lingo (even if it is C99).
This commit is contained in:
rocky
2004-09-03 23:20:11 +00:00
parent 9eb10f8065
commit c1905e6879
17 changed files with 196 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -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 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
dnl 02111-1307, USA. dnl 02111-1307, USA.
define(RELEASE_NUM, 70) define(RELEASE_NUM, 71)
define(CDIO_VERSION_STR, 0.$1) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) 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_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE

6
include/cdio/types.h
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -106,11 +106,11 @@ extern "C" {
{ {
false = 0, false = 0,
true = 1 true = 1
} _Bool; } _cdio_Bool;
# define false false # define false false
# define true true # define true true
# define bool _Bool # define bool _cdio_Bool
# endif # endif
#endif #endif

7
lib/_cdio_bsdi.c
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,8 +27,9 @@
# include "config.h" # include "config.h"
#endif #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 <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
#include "cdio_assert.h" #include "cdio_assert.h"
@@ -811,7 +812,7 @@ cdio_open_bsdi (const char *psz_orig_source)
else { else {
/* The below would be okay if all device drivers worked this way. */ /* The below would be okay if all device drivers worked this way. */
#if 0 #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 #endif
return NULL; return NULL;
} }

7
lib/_cdio_generic.c
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #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 <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -198,7 +198,8 @@ cdio_is_device_quiet_generic(const char *source_name)
Use cdio_free_device_list() to free this device_list. Use cdio_free_device_list() to free this device_list.
*/ */
void 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) { if (NULL != drive) {
unsigned int j; unsigned int j;

8
lib/_cdio_linux.c
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #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 <string.h> #include <string.h>
@@ -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); set_arg_linux(_data, "source", psz_orig_source);
else { else {
/* The below would be okay if all device drivers worked this way. */ /* 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; return NULL;
} }
} }

5
lib/_cdio_osx.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
from vcdimager code: from vcdimager code:
@@ -34,8 +34,9 @@
#include "config.h" #include "config.h"
#endif #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 <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
#include "cdio_assert.h" #include "cdio_assert.h"

74
lib/_cdio_sunos.c
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 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.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 #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>
@@ -767,7 +767,7 @@ cdio_get_devices_solaris (void)
char volpath[256]; char volpath[256];
struct stat st; struct stat st;
char **drives = NULL; char **drives = NULL;
int num_files=0; unsigned int i_files=0;
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
unsigned int i; unsigned int i;
glob_t globbuf; glob_t globbuf;
@@ -782,9 +782,9 @@ cdio_get_devices_solaris (void)
if(S_ISDIR(st.st_mode)) { if(S_ISDIR(st.st_mode)) {
sprintf(volpath, "%s/s0", globbuf.gl_pathv[i]); sprintf(volpath, "%s/s0", globbuf.gl_pathv[i]);
if(stat(volpath, &st) == 0) if(stat(volpath, &st) == 0)
cdio_add_device_list(&drives, volpath, &num_files); cdio_add_device_list(&drives, volpath, &i_files);
}else }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); globfree(&globbuf);
#else #else
@@ -793,12 +793,12 @@ cdio_get_devices_solaris (void)
if(S_ISDIR(st.st_mode)) { if(S_ISDIR(st.st_mode)) {
sprintf(volpath, "%s/s0", DEFAULT_CDIO_DEVICE); sprintf(volpath, "%s/s0", DEFAULT_CDIO_DEVICE);
if(stat(volpath, &st) == 0) if(stat(volpath, &st) == 0)
cdio_add_device_list(&drives, volpath, &num_files); cdio_add_device_list(&drives, volpath, &i_files);
}else }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*/ #endif /*HAVE_GLOB_H*/
cdio_add_device_list(&drives, NULL, &num_files); cdio_add_device_list(&drives, NULL, &i_files);
return drives; return drives;
#endif /*HAVE_SOLARIS_CDROM*/ #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; _img_private_t *_data;
char *psz_source; char *psz_source;
cdio_funcs _funcs = { cdio_funcs _funcs;
.eject_media = eject_media_solaris,
.free = cdio_generic_free, _funcs.eject_media = eject_media_solaris;
.get_arg = get_arg_solaris, _funcs.free = cdio_generic_free;
.get_cdtext = get_cdtext_generic, _funcs.get_arg = get_arg_solaris;
.get_default_device = cdio_get_default_device_solaris, _funcs.get_cdtext = get_cdtext_generic;
.get_devices = cdio_get_devices_solaris, _funcs.get_default_device = cdio_get_default_device_solaris;
.get_discmode = get_discmode_solaris, _funcs.get_devices = cdio_get_devices_solaris;
.get_drive_cap = scsi_mmc_get_drive_cap_generic, _funcs.get_discmode = get_discmode_solaris;
.get_first_track_num= get_first_track_num_generic, _funcs.get_drive_cap = scsi_mmc_get_drive_cap_generic;
.get_mcn = scsi_mmc_get_mcn_generic, _funcs.get_first_track_num= get_first_track_num_generic;
.get_num_tracks = get_num_tracks_generic, _funcs.get_mcn = scsi_mmc_get_mcn_generic,
.get_track_format = get_track_format_solaris, _funcs.get_num_tracks = get_num_tracks_generic;
.get_track_green = _cdio_get_track_green, _funcs.get_track_format = get_track_format_solaris;
.get_track_lba = NULL, /* This could be implemented if need be. */ _funcs.get_track_green = _cdio_get_track_green;
.get_track_msf = _cdio_get_track_msf, _funcs.get_track_lba = NULL; /* This could be implemented if need be. */
.lseek = cdio_generic_lseek, _funcs.get_track_msf = _cdio_get_track_msf;
.read = cdio_generic_read, _funcs.lseek = cdio_generic_lseek;
.read_audio_sectors = _read_audio_sectors_solaris, _funcs.read = cdio_generic_read;
.read_mode1_sector = _read_mode1_sector_solaris, _funcs.read_audio_sectors = _read_audio_sectors_solaris;
.read_mode1_sectors = _read_mode1_sectors_solaris, _funcs.read_mode1_sector = _read_mode1_sector_solaris;
.read_mode2_sector = _read_mode2_sector_solaris, _funcs.read_mode1_sectors = _read_mode1_sectors_solaris;
.read_mode2_sectors = _read_mode2_sectors_solaris, _funcs.read_mode2_sector = _read_mode2_sector_solaris;
.read_toc = read_toc_solaris, _funcs.read_mode2_sectors = _read_mode2_sectors_solaris;
.run_scsi_mmc_cmd = run_scsi_cmd_solaris, _funcs.read_toc = read_toc_solaris;
.stat_size = _cdio_stat_size, _funcs.run_scsi_mmc_cmd = run_scsi_cmd_solaris;
.set_arg = _set_arg_solaris _funcs.stat_size = _cdio_stat_size;
}; _funcs.set_arg = _set_arg_solaris;
_data = _cdio_malloc (sizeof (_img_private_t)); _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 { else {
/* The below would be okay if all device drivers worked this way. */ /* The below would be okay if all device drivers worked this way. */
#if 0 #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 #endif
return NULL; return NULL;
} }

12
lib/cdio.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -39,7 +39,7 @@
#include <cdio/logging.h> #include <cdio/logging.h>
#include "cdio_private.h" #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] = 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=search_devices;
char **drives_ret=NULL; char **drives_ret=NULL;
int num_drives=0; unsigned int i_drives=0;
*p_driver_id = DRIVER_DEVICE; *p_driver_id = DRIVER_DEVICE;
@@ -437,7 +437,7 @@ cdio_get_devices_with_cap_ret (/*out*/ char* search_devices[],
char **d = drives; char **d = drives;
for( ; *d != NULL; d++ ) { for( ; *d != NULL; d++ ) {
cdio_add_device_list(&drives_ret, *d, &num_drives); cdio_add_device_list(&drives_ret, *d, &i_drives);
} }
} else { } else {
cdio_fs_anal_t got_fs=0; 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) != 0
: (got_fs | ~need_fs_ext) == -1; : (got_fs | ~need_fs_ext) == -1;
if (doit) if (doit)
cdio_add_device_list(&drives_ret, *d, &num_drives); cdio_add_device_list(&drives_ret, *d, &i_drives);
} }
cdio_destroy(cdio); 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); cdio_free_device_list(drives);
free(drives); free(drives);
return drives_ret; return drives_ret;

4
lib/cdio_private.h
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -306,7 +306,7 @@ extern "C" {
Use cdio_free_device_list() to free this device_list. Use cdio_free_device_list() to free this device_list.
*/ */
void cdio_add_device_list(char **device_list[], const char *drive, void cdio_add_device_list(char **device_list[], const char *drive,
int *num_drives); unsigned int *i_drives);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
lib/cdtext.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools toc reading routine adapted from cuetools
@@ -149,7 +149,7 @@ cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext)
*/ */
bool bool
cdtext_data_init(void *user_data, track_t i_first_track, 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) set_cdtext_field_fn_t set_cdtext_field_fn)
{ {
CDText_data_t *pdata; CDText_data_t *pdata;

4
lib/cdtext_private.h
View File

@@ -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 <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -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. Internal routine to parse all CD-TEXT data retrieved.
*/ */
bool cdtext_data_init(void *user_data, track_t i_first_track, 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); set_cdtext_field_fn_t set_cdtext_field_fn);

104
lib/image/bincue.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
(*.cue). (*.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 "image.h"
#include "cdio_assert.h" #include "cdio_assert.h"
@@ -1140,64 +1140,64 @@ cdio_open_cue (const char *psz_cue_name)
_img_private_t *_data; _img_private_t *_data;
char *psz_bin_name; char *psz_bin_name;
cdio_funcs _funcs = { 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
};
if (NULL == psz_cue_name) 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;
_data = _cdio_malloc (sizeof (_img_private_t)); if (NULL == psz_cue_name) return NULL;
_data->gen.init = false;
_data->psz_cue_name = NULL;
ret = cdio_new ((void *)_data, &_funcs); _data = _cdio_malloc (sizeof (_img_private_t));
_data->gen.init = false;
_data->psz_cue_name = NULL;
if (ret == NULL) { ret = cdio_new ((void *)_data, &_funcs);
free(_data);
return NULL;
}
psz_bin_name = cdio_is_cuefile(psz_cue_name); if (ret == NULL) {
free(_data);
return NULL;
}
if (NULL == psz_bin_name) { psz_bin_name = cdio_is_cuefile(psz_cue_name);
cdio_error ("source name %s is not recognized as a CUE file",
psz_cue_name);
}
_set_arg_image (_data, "cue", psz_cue_name); if (NULL == psz_bin_name) {
_set_arg_image (_data, "source", psz_bin_name); cdio_error ("source name %s is not recognized as a CUE file",
free(psz_bin_name); psz_cue_name);
}
if (_init_bincue(_data)) { _set_arg_image (_data, "cue", psz_cue_name);
return ret; _set_arg_image (_data, "source", psz_bin_name);
} else { free(psz_bin_name);
_free_image(_data);
free(ret); if (_init_bincue(_data)) {
return NULL; return ret;
} } else {
_free_image(_data);
free(ret);
return NULL;
}
} }
bool bool

56
lib/image/cdrdao.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
(*.cue). (*.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 "image.h"
#include "cdio_assert.h" #include "cdio_assert.h"
@@ -1124,32 +1124,32 @@ cdio_open_cdrdao (const char *psz_cue_name)
CdIo *ret; CdIo *ret;
_img_private_t *_data; _img_private_t *_data;
cdio_funcs _funcs = { cdio_funcs _funcs;
.eject_media = _eject_media_image,
.free = _free_image, _funcs.eject_media = _eject_media_image;
.get_arg = _get_arg_image, _funcs.free = _free_image;
.get_cdtext = get_cdtext_generic, _funcs.get_arg = _get_arg_image;
.get_devices = cdio_get_devices_cdrdao, _funcs.get_cdtext = get_cdtext_generic;
.get_default_device = cdio_get_default_device_cdrdao, _funcs.get_devices = cdio_get_devices_cdrdao;
.get_discmode = _get_discmode_image, _funcs.get_default_device = cdio_get_default_device_cdrdao;
.get_drive_cap = _get_drive_cap_image, _funcs.get_discmode = _get_discmode_image;
.get_first_track_num= _get_first_track_num_image, _funcs.get_drive_cap = _get_drive_cap_image;
.get_mcn = _get_mcn_image, _funcs.get_first_track_num= _get_first_track_num_image;
.get_num_tracks = _get_num_tracks_image, _funcs.get_mcn = _get_mcn_image;
.get_track_format = _get_track_format_cdrdao, _funcs.get_num_tracks = _get_num_tracks_image;
.get_track_green = _get_track_green_cdrdao, _funcs.get_track_format = _get_track_format_cdrdao;
.get_track_lba = _get_lba_track_cdrdao, _funcs.get_track_green = _get_track_green_cdrdao;
.get_track_msf = _get_track_msf_image, _funcs.get_track_lba = _get_lba_track_cdrdao;
.lseek = _lseek_cdrdao, _funcs.get_track_msf = _get_track_msf_image;
.read = _read_cdrdao, _funcs.lseek = _lseek_cdrdao;
.read_audio_sectors = _read_audio_sectors_cdrdao, _funcs.read = _read_cdrdao;
.read_mode1_sector = _read_mode1_sector_cdrdao, _funcs.read_audio_sectors = _read_audio_sectors_cdrdao;
.read_mode1_sectors = _read_mode1_sectors_cdrdao, _funcs.read_mode1_sector = _read_mode1_sector_cdrdao;
.read_mode2_sector = _read_mode2_sector_cdrdao, _funcs.read_mode1_sectors = _read_mode1_sectors_cdrdao;
.read_mode2_sectors = _read_mode2_sectors_cdrdao, _funcs.read_mode2_sector = _read_mode2_sector_cdrdao;
.set_arg = _set_arg_image, _funcs.read_mode2_sectors = _read_mode2_sectors_cdrdao;
.stat_size = _stat_size_cdrdao _funcs.set_arg = _set_arg_image;
}; _funcs.stat_size = _stat_size_cdrdao;
if (NULL == psz_cue_name) return NULL; if (NULL == psz_cue_name) return NULL;

56
lib/image/nrg.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -45,7 +45,7 @@
#include "_cdio_stdio.h" #include "_cdio_stdio.h"
#include "nrg.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 */ /* reader */
@@ -1185,32 +1185,32 @@ cdio_open_nrg (const char *psz_source)
CdIo *ret; CdIo *ret;
_img_private_t *_data; _img_private_t *_data;
cdio_funcs _funcs = { cdio_funcs _funcs;
.eject_media = _eject_media_nrg,
.free = _free_nrg, _funcs.eject_media = _eject_media_nrg;
.get_arg = _get_arg_image, _funcs.free = _free_nrg;
.get_cdtext = get_cdtext_generic, _funcs.get_arg = _get_arg_image;
.get_devices = cdio_get_devices_nrg, _funcs.get_cdtext = get_cdtext_generic;
.get_default_device = cdio_get_default_device_nrg, _funcs.get_devices = cdio_get_devices_nrg;
.get_discmode = _get_discmode_image, _funcs.get_default_device = cdio_get_default_device_nrg;
.get_drive_cap = _get_drive_cap_image, _funcs.get_discmode = _get_discmode_image;
.get_first_track_num= _get_first_track_num_image, _funcs.get_drive_cap = _get_drive_cap_image;
.get_mcn = _get_mcn_image, _funcs.get_first_track_num= _get_first_track_num_image;
.get_num_tracks = _get_num_tracks_image, _funcs.get_mcn = _get_mcn_image;
.get_track_format = _get_track_format_nrg, _funcs.get_num_tracks = _get_num_tracks_image;
.get_track_green = _get_track_green_nrg, _funcs.get_track_format = _get_track_format_nrg;
.get_track_lba = NULL, /* Will use generic routine via msf */ _funcs.get_track_green = _get_track_green_nrg;
.get_track_msf = _get_track_msf_image, _funcs.get_track_lba = NULL; /* Will use generic routine via msf */
.lseek = _lseek_nrg, _funcs.get_track_msf = _get_track_msf_image;
.read = _read_nrg, _funcs.lseek = _lseek_nrg;
.read_audio_sectors = _read_audio_sectors_nrg, _funcs.read = _read_nrg;
.read_mode1_sector = _read_mode1_sector_nrg, _funcs.read_audio_sectors = _read_audio_sectors_nrg;
.read_mode1_sectors = _read_mode1_sectors_nrg, _funcs.read_mode1_sector = _read_mode1_sector_nrg;
.read_mode2_sector = _read_mode2_sector_nrg, _funcs.read_mode1_sectors = _read_mode1_sectors_nrg;
.read_mode2_sectors = _read_mode2_sectors_nrg, _funcs.read_mode2_sector = _read_mode2_sector_nrg;
.set_arg = _set_arg_image, _funcs.read_mode2_sectors = _read_mode2_sectors_nrg;
.stat_size = _stat_size_nrg, _funcs.set_arg = _set_arg_image;
}; _funcs.stat_size = _stat_size_nrg;
_data = _cdio_malloc (sizeof (_img_private_t)); _data = _cdio_malloc (sizeof (_img_private_t));
_data->gen.init = false; _data->gen.init = false;

4
lib/scsi_mmc.c
View File

@@ -1,6 +1,6 @@
/* Common SCSI Multimedia Command (MMC) routines. /* 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 <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -527,7 +527,7 @@ scsi_mmc_init_cdtext_private ( void *p_user_data,
generic_img_private_t *p_env = p_user_data; generic_img_private_t *p_env = p_user_data;
scsi_mmc_cdb_t cdb = {{0, }}; scsi_mmc_cdb_t cdb = {{0, }};
char wdata[5000] = { 0, }; unsigned char wdata[5000] = { 0, };
int i_status; int i_status;
if ( ! p_env || ! run_scsi_mmc_cmd || p_env->b_cdtext_error ) if ( ! p_env || ! run_scsi_mmc_cmd || p_env->b_cdtext_error )

7
lib/sector.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
@@ -35,7 +35,7 @@
#include <ctype.h> #include <ctype.h>
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 lba_t
cdio_lba_to_lsn (lba_t lba) cdio_lba_to_lsn (lba_t lba)
@@ -90,7 +90,8 @@ cdio_lba_to_msf_str (lba_t lba)
if (CDIO_INVALID_LBA == lba) { if (CDIO_INVALID_LBA == lba) {
return strdup("*INVALID"); return strdup("*INVALID");
} else { } 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); cdio_lba_to_msf (lba, &msf);
return cdio_msf_to_str(&msf); return cdio_msf_to_str(&msf);
} }

7
lib/util.c
View File

@@ -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 <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -33,9 +33,10 @@
#endif #endif
#include "cdio_assert.h" #include "cdio_assert.h"
#include <cdio/types.h>
#include <cdio/util.h> #include <cdio/util.h>
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 size_t
_cdio_strlenv(char **str_array) _cdio_strlenv(char **str_array)