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

mode{1,2}_form2 -> b_form2

Browse Source
This commit is contained in:
rocky
2004-03-07 02:42:22 +00:00
parent 6f968b9fe1
commit 6fad463e33
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.31 2004/03/07 01:40:00 rocky Exp $ $Id: _cdio_linux.c,v 1.32 2004/03/07 02:42:22 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.31 2004/03/07 01:40:00 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.32 2004/03/07 02:42:22 rocky Exp $";
#include <string.h> #include <string.h>
@@ -358,7 +358,7 @@ _read_packet_mode2_sectors (int fd, void *buf, lba_t lba,
*/ */
static int static int
_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn, _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
bool mode1_form2) bool b_form2)
{ {
char buf[M2RAW_SECTOR_SIZE] = { 0, }; char buf[M2RAW_SECTOR_SIZE] = { 0, };
@@ -414,14 +414,14 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
} }
memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE, memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE,
mode1_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE); b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
#else #else
if (0 > cdio_generic_lseek(env, CDIO_CD_FRAMESIZE*lsn, SEEK_SET)) if (0 > cdio_generic_lseek(env, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
return -1; return -1;
if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE)) if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE))
return -1; return -1;
memcpy (data, buf, mode1_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE); memcpy (data, buf, b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
#endif #endif
return 0; return 0;
} }
@@ -433,17 +433,17 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
*/ */
static int static int
_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn, _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
bool mode1_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *_obj = env;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = mode1_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if ( (retval = _cdio_read_mode1_sector (_obj, if ( (retval = _cdio_read_mode1_sector (_obj,
((char *)data) + (blocksize * i), ((char *)data) + (blocksize * i),
lsn + i, mode1_form2)) ) lsn + i, b_form2)) )
return retval; return retval;
} }
return 0; return 0;
@@ -455,7 +455,7 @@ _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
*/ */
static int static int
_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn, _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
bool mode2_form2) bool b_form2)
{ {
char buf[M2RAW_SECTOR_SIZE] = { 0, }; char buf[M2RAW_SECTOR_SIZE] = { 0, };
struct cdrom_msf *msf = (struct cdrom_msf *) &buf; struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
@@ -508,7 +508,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
break; break;
} }
if (mode2_form2) if (b_form2)
memcpy (data, buf, M2RAW_SECTOR_SIZE); memcpy (data, buf, M2RAW_SECTOR_SIZE);
else else
memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE); memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
@@ -523,17 +523,17 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
*/ */
static int static int
_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn, _cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
bool mode2_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *_obj = env;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if ( (retval = _cdio_read_mode2_sector (_obj, if ( (retval = _cdio_read_mode2_sector (_obj,
((char *)data) + (blocksize * i), ((char *)data) + (blocksize * i),
lsn + i, mode2_form2)) ) lsn + i, b_form2)) )
return retval; return retval;
} }
return 0; return 0;