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

118
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) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -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

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>
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));

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) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -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;