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

26
lib/_cdio_sunos.c
View File

@@ -1,8 +1,8 @@
/*
$Id: _cdio_sunos.c,v 1.23 2004/03/06 05:04:41 rocky Exp $
$Id: _cdio_sunos.c,v 1.24 2004/03/06 18:22:07 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
#ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.23 2004/03/06 05:04:41 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.24 2004/03/06 18:22:07 rocky Exp $";
#include <stdio.h>
#include <stdlib.h>
@@ -229,7 +229,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)
{
char buf[M2RAW_SECTOR_SIZE] = { 0, };
@@ -240,7 +240,7 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
return -1;
if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE))
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
return 0;
}
@@ -252,17 +252,17 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
*/
static int
_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;
unsigned 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;
@@ -274,7 +274,7 @@ _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
*/
static int
_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
bool mode2_form2)
bool b_form2)
{
char buf[M2RAW_SECTOR_SIZE] = { 0, };
struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
@@ -362,7 +362,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
}
}
if (mode2_form2)
if (b_form2)
memcpy (data, buf, M2RAW_SECTOR_SIZE);
else
memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
@@ -377,17 +377,17 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
*/
static int
_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;
unsigned 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;