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

Mostly portability issues from or inspired by mog's changes for XBOX.

Browse Source 
image/*.c: initialize func structure to 0 (NULL).

include/cdio/*.h: add "extern C" for C++ compilations where
appropriate.
This commit is contained in:
rocky
2004-10-31 06:07:26 +00:00
parent 4c2ba6c953
commit 64f2ad383d
5 changed files with 125 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/image/cdrdao.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cdrdao.c,v 1.28 2004/09/04 00:06:50 rocky Exp $
$Id: cdrdao.c,v 1.29 2004/10/31 06:07:26 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.28 2004/09/04 00:06:50 rocky Exp $";
static const char _rcsid[] = "$Id: cdrdao.c,v 1.29 2004/10/31 06:07:26 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -1135,34 +1135,36 @@ cdio_open_cdrdao (const char *psz_cue_name)
CdIo *ret;
_img_private_t *_data;
cdio_funcs _funcs;
cdio_funcs _funcs;
memset( &_funcs, 0, sizeof(_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_hwinfo = get_hwinfo_cdrdao;
_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;
_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_hwinfo = get_hwinfo_cdrdao;
_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));