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

regularize variable names mode{1,2}_form2 -> b_form2

Browse Source
This commit is contained in:
rocky
2004-03-06 18:22:07 +00:00
parent f6dceffef2
commit af2c12ddc1
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/image/bincue.c
View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.4 2004/03/06 03:21:59 rocky Exp $
$Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.4 2004/03/06 03:21:59 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp $";
#include "cdio_assert.h"
#include "cdio_private.h"
@@ -511,7 +511,7 @@ _cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
*/
static int
_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
bool mode1_form2)
bool b_form2)
{
_img_private_t *_obj = env;
int ret;
@@ -533,7 +533,7 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
if (ret==0) return ret;
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);
return 0;
}
@@ -545,17 +545,17 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
*/
static int
_cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
bool mode1_form2, unsigned int nblocks)
bool b_form2, unsigned int nblocks)
{
_img_private_t *_obj = env;
int i;
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++) {
if ( (retval = _cdio_read_mode1_sector (_obj,
((char *)data) + (blocksize * i),
lsn + i, mode1_form2)) )
lsn + i, b_form2)) )
return retval;
}
return 0;
@@ -567,7 +567,7 @@ _cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
*/
static int
_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
bool mode2_form2)
bool b_form2)
{
_img_private_t *_obj = env;
int ret;
@@ -596,7 +596,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
/* See NOTE above. */
if (mode2_form2)
if (b_form2)
memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE,
M2RAW_SECTOR_SIZE);
else
@@ -612,17 +612,17 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
*/
static int
_cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn,
bool mode2_form2, unsigned int nblocks)
bool b_form2, unsigned int nblocks)
{
_img_private_t *_obj = env;
int i;
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++) {
if ( (retval = _cdio_read_mode2_sector (_obj,
((char *)data) + (blocksize * i),
lsn + i, mode2_form2)) )
lsn + i, b_form2)) )
return retval;
}
return 0;