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

More regularization of names. Warning: untested on freebsd and osx.

Browse Source
This commit is contained in:
rocky
2004-04-25 15:41:26 +00:00
parent a664ea08b0
commit 3ecd485a7d
3 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_linux.c,v 1.37 2004/04/25 14:07:23 rocky Exp $
$Id: _cdio_linux.c,v 1.38 2004/04/25 15:41:26 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.37 2004/04/25 14:07:23 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.38 2004/04/25 15:41:26 rocky Exp $";
#include <string.h>
@@ -266,8 +266,8 @@ _cdio_mmc_read_sectors (int fd, void *buf, lba_t lba, int sector_type,
Can read only up to 25 blocks.
*/
static int
_cdio_read_audio_sectors (void *env, void *buf, lsn_t lsn,
unsigned int nblocks)
_read_audio_sectors_linux (void *env, void *buf, lsn_t lsn,
unsigned int nblocks)
{
_img_private_t *_obj = env;
return _cdio_mmc_read_sectors( _obj->gen.fd, buf, lsn,
@@ -357,7 +357,7 @@ _read_packet_mode2_sectors (int fd, void *buf, lba_t lba,
from lsn. Returns 0 if no error.
*/
static int
_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
_read_mode1_sector_linux (void *env, void *data, lsn_t lsn,
bool b_form2)
{
@@ -432,7 +432,7 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
Returns 0 if no error.
*/
static int
_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
_read_mode1_sectors_linux (void *env, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks)
{
_img_private_t *_obj = env;
@@ -441,7 +441,7 @@ _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) {
if ( (retval = _cdio_read_mode1_sector (_obj,
if ( (retval = _read_mode1_sector_linux (_obj,
((char *)data) + (blocksize * i),
lsn + i, b_form2)) )
return retval;
@@ -454,7 +454,7 @@ _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
from lsn. Returns 0 if no error.
*/
static int
_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
_read_mode2_sector_linux (void *env, void *data, lsn_t lsn,
bool b_form2)
{
char buf[M2RAW_SECTOR_SIZE] = { 0, };
@@ -522,7 +522,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
Returns 0 if no error.
*/
static int
_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
_read_mode2_sectors_linux (void *env, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks)
{
_img_private_t *_obj = env;
@@ -531,7 +531,7 @@ _cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) {
if ( (retval = _cdio_read_mode2_sector (_obj,
if ( (retval = _read_mode2_sector_linux (_obj,
((char *)data) + (blocksize * i),
lsn + i, b_form2)) )
return retval;
@@ -543,7 +543,7 @@ _cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
Return the size of the CD in logical block address (LBA) units.
*/
static uint32_t
_cdio_stat_size (void *env)
_stat_size_linux (void *env)
{
_img_private_t *_obj = env;
@@ -572,7 +572,7 @@ _cdio_stat_size (void *env)
0 is returned if no error was found, and nonzero if there as an error.
*/
static int
_cdio_set_arg (void *env, const char key[], const char value[])
_set_arg_linux (void *env, const char key[], const char value[])
{
_img_private_t *_obj = env;
@@ -720,7 +720,7 @@ _cdio_eject_scsi(int fd)
Return 0 if success and 1 for failure, and 2 if no routine.
*/
static int
_cdio_eject_media (void *env) {
_eject_media_linux (void *env) {
_img_private_t *_obj = env;
int ret=2;
@@ -767,7 +767,7 @@ _cdio_eject_media (void *env) {
Return the value associated with the key "arg".
*/
static const char *
_cdio_get_arg (void *env, const char key[])
_get_arg_linux (void *env, const char key[])
{
_img_private_t *_obj = env;
@@ -793,7 +793,7 @@ _cdio_get_arg (void *env, const char key[])
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_cdio_get_first_track_num(void *env)
_get_first_track_num_linux(void *env)
{
_img_private_t *_obj = env;
@@ -810,7 +810,7 @@ _cdio_get_first_track_num(void *env)
*/
static char *
_cdio_get_mcn_linux (const void *env) {
_get_mcn_linux (const void *env) {
struct cdrom_mcn mcn;
const _img_private_t *_obj = env;
@@ -828,7 +828,7 @@ _cdio_get_mcn_linux (const void *env) {
*/
static cdio_drive_cap_t
_cdio_get_drive_cap_linux (const void *env) {
_get_drive_cap_linux (const void *env) {
const _img_private_t *_obj = env;
int32_t i_drivetype;
@@ -845,7 +845,7 @@ _cdio_get_drive_cap_linux (const void *env) {
CDIO_INVALID_TRACK is returned on error.
*/
static track_t
_cdio_get_num_tracks(void *env)
_get_num_tracks_linux(void *env)
{
_img_private_t *_obj = env;
@@ -858,7 +858,7 @@ _cdio_get_num_tracks(void *env)
Get format of track.
*/
static track_format_t
_cdio_get_track_format(void *env, track_t track_num)
_get_track_format_linux(void *env, track_t track_num)
{
_img_private_t *_obj = env;
@@ -891,7 +891,7 @@ _cdio_get_track_format(void *env, track_t track_num)
FIXME: there's gotta be a better design for this and get_track_format?
*/
static bool
_cdio_get_track_green(void *env, track_t track_num)
_get_track_green_linux(void *env, track_t track_num)
{
_img_private_t *_obj = env;
@@ -916,7 +916,7 @@ _cdio_get_track_green(void *env, track_t track_num)
False is returned if there is no track entry.
*/
static bool
_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
_get_track_msf_linux(void *env, track_t track_num, msf_t *msf)
{
_img_private_t *_obj = env;
@@ -1075,28 +1075,28 @@ cdio_open_linux (const char *orig_source_name)
char *source_name;
cdio_funcs _funcs = {
.eject_media = _cdio_eject_media,
.eject_media = _eject_media_linux,
.free = cdio_generic_free,
.get_arg = _cdio_get_arg,
.get_arg = _get_arg_linux,
.get_devices = cdio_get_devices_linux,
.get_default_device = cdio_get_default_device_linux,
.get_drive_cap = _cdio_get_drive_cap_linux,
.get_first_track_num= _cdio_get_first_track_num,
.get_mcn = _cdio_get_mcn_linux,
.get_num_tracks = _cdio_get_num_tracks,
.get_track_format = _cdio_get_track_format,
.get_track_green = _cdio_get_track_green,
.get_drive_cap = _get_drive_cap_linux,
.get_first_track_num= _get_first_track_num_linux,
.get_mcn = _get_mcn_linux,
.get_num_tracks = _get_num_tracks_linux,
.get_track_format = _get_track_format_linux,
.get_track_green = _get_track_green_linux,
.get_track_lba = NULL, /* This could be implemented if need be. */
.get_track_msf = _cdio_get_track_msf,
.get_track_msf = _get_track_msf_linux,
.lseek = cdio_generic_lseek,
.read = cdio_generic_read,
.read_audio_sectors = _cdio_read_audio_sectors,
.read_mode1_sector = _cdio_read_mode1_sector,
.read_mode1_sectors = _cdio_read_mode1_sectors,
.read_mode2_sector = _cdio_read_mode2_sector,
.read_mode2_sectors = _cdio_read_mode2_sectors,
.set_arg = _cdio_set_arg,
.stat_size = _cdio_stat_size
.read_audio_sectors = _read_audio_sectors_linux,
.read_mode1_sector = _read_mode1_sector_linux,
.read_mode1_sectors = _read_mode1_sectors_linux,
.read_mode2_sector = _read_mode2_sector_linux,
.read_mode2_sectors = _read_mode2_sectors_linux,
.set_arg = _set_arg_linux,
.stat_size = _stat_size_linux
};
_data = _cdio_malloc (sizeof (_img_private_t));
@@ -1107,11 +1107,11 @@ cdio_open_linux (const char *orig_source_name)
if (NULL == orig_source_name) {
source_name=cdio_get_default_device_linux();
if (NULL == source_name) return NULL;
_cdio_set_arg(_data, "source", source_name);
_set_arg_linux(_data, "source", source_name);
free(source_name);
} else {
if (cdio_is_device_generic(orig_source_name))
_cdio_set_arg(_data, "source", orig_source_name);
_set_arg_linux(_data, "source", orig_source_name);
else {
cdio_info ("source %s is a not a device", orig_source_name);
return NULL;