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

Fix all those *env = env after renaming; It should be *env = user_data.

Browse Source
This commit is contained in:
rocky
2004-06-03 09:22:10 +00:00
parent 4ebd2a09f0
commit 293747adb3
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/_cdio_bsdi.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_bsdi.c,v 1.24 2004/06/02 00:43:53 rocky Exp $ $Id: _cdio_bsdi.c,v 1.25 2004/06/03 09:22:10 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_bsdi.c,v 1.24 2004/06/02 00:43:53 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.25 2004/06/03 09:22:10 rocky Exp $";
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
@@ -149,7 +149,7 @@ _read_audio_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
struct cdrom_msf *msf = (struct cdrom_msf *) &buf; struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
msf_t _msf; msf_t _msf;
_img_private_t *env = env; _img_private_t *env = user_data;
cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf); cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
msf->cdmsf_min0 = from_bcd8(_msf.m); msf->cdmsf_min0 = from_bcd8(_msf.m);
@@ -226,7 +226,7 @@ static int
_read_mode1_sectors_bsdi (void *user_data, void *data, lsn_t lsn, _read_mode1_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
@@ -252,7 +252,7 @@ _read_mode2_sector_bsdi (void *user_data, void *data, lsn_t lsn,
struct cdrom_msf *msf = (struct cdrom_msf *) &buf; struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
msf_t _msf; msf_t _msf;
_img_private_t *env = env; _img_private_t *env = user data;
cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf); cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
msf->cdmsf_min0 = from_bcd8(_msf.m); msf->cdmsf_min0 = from_bcd8(_msf.m);
@@ -308,24 +308,17 @@ static int
_read_mode2_sectors_bsdi (void *user_data, void *data, lsn_t lsn, _read_mode2_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
int i; unsigned int i;
int retval; unsigned int i_blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
/* For each frame, pick out the data part we need */
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if (b_form2) { int retval = _read_mode2_sector_bsd i(env,
if ( (retval = _read_mode2_sector_bsdi (env, ((char *)data) +
((char *)data) + (M2RAW_SECTOR_SIZE * i), (i_blocksize * i),
lsn + i, true)) ) lsn + i, b_form2);
return retval; if (retval) return retval;
} else {
char buf[M2RAW_SECTOR_SIZE] = { 0, };
if ( (retval = _read_mode2_sector_bsdi (env, buf, lsn + i, true)) )
return retval;
memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i),
buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
}
} }
return 0; return 0;
} }
@@ -336,7 +329,7 @@ _read_mode2_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
static uint32_t static uint32_t
_stat_size_bsdi (void *user_data) _stat_size_bsdi (void *user_data)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
struct cdrom_tocentry tocent; struct cdrom_tocentry tocent;
uint32_t size; uint32_t size;
@@ -360,7 +353,7 @@ _stat_size_bsdi (void *user_data)
static int static int
_set_arg_bsdi (void *user_data, const char key[], const char value[]) _set_arg_bsdi (void *user_data, const char key[], const char value[])
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (!strcmp (key, "source")) if (!strcmp (key, "source"))
{ {
@@ -448,7 +441,7 @@ _cdio_read_toc (_img_private_t *env)
static int static int
_eject_media_bsdi (void *user_data) { _eject_media_bsdi (void *user_data) {
_img_private_t *env = env; _img_private_t *env = user_data;
int ret=2; int ret=2;
int status; int status;
int fd; int fd;
@@ -485,7 +478,7 @@ _eject_media_bsdi (void *user_data) {
static const char * static const char *
_get_arg_bsdi (void *user_data, const char key[]) _get_arg_bsdi (void *user_data, const char key[])
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (!strcmp (key, "source")) { if (!strcmp (key, "source")) {
return env->source_name; return env->source_name;
@@ -507,7 +500,7 @@ _get_arg_bsdi (void *user_data, const char key[])
static track_t static track_t
_get_first_track_num_bsdi(void *user_data) _get_first_track_num_bsdi(void *user_data)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (!env->toc_init) _cdio_read_toc (env) ; if (!env->toc_init) _cdio_read_toc (env) ;
@@ -523,7 +516,7 @@ static char *
_get_mcn_bsdi (const void *user_data) { _get_mcn_bsdi (const void *user_data) {
struct cdrom_mcn mcn; struct cdrom_mcn mcn;
const _img_private_t *env = env; const _img_private_t *env = user_data;
if (ioctl(env->gen.fd, CDROM_GET_MCN, &mcn) != 0) if (ioctl(env->gen.fd, CDROM_GET_MCN, &mcn) != 0)
return NULL; return NULL;
return strdup(mcn.medium_catalog_number); return strdup(mcn.medium_catalog_number);
@@ -536,7 +529,7 @@ _get_mcn_bsdi (const void *user_data) {
static track_t static track_t
_get_num_tracks_bsdi(void *user_data) _get_num_tracks_bsdi(void *user_data)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (!env->toc_init) _cdio_read_toc (env) ; if (!env->toc_init) _cdio_read_toc (env) ;
@@ -549,7 +542,7 @@ _get_num_tracks_bsdi(void *user_data)
static track_format_t static track_format_t
_get_track_format_bsdi(void *user_data, track_t i_track) _get_track_format_bsdi(void *user_data, track_t i_track)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (!env->toc_init) _cdio_read_toc (env) ; if (!env->toc_init) _cdio_read_toc (env) ;
@@ -584,7 +577,7 @@ _get_track_format_bsdi(void *user_data, track_t i_track)
static bool static bool
_get_track_green_bsdi(void *user_data, track_t i_track) _get_track_green_bsdi(void *user_data, track_t i_track)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (!env->toc_init) _cdio_read_toc (env) ; if (!env->toc_init) _cdio_read_toc (env) ;
@@ -609,7 +602,7 @@ _get_track_green_bsdi(void *user_data, track_t i_track)
static bool static bool
_get_track_msf_bsdi(void *user_data, track_t i_track, msf_t *msf) _get_track_msf_bsdi(void *user_data, track_t i_track, msf_t *msf)
{ {
_img_private_t *env = env; _img_private_t *env = user_data;
if (NULL == msf) return false; if (NULL == msf) return false;