libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reacted on warnings of -Wunused-but-set-variable

Browse Source
This commit is contained in:
Thomas Schmitt 2011-07-06 14:34:58 +00:00
parent 9eb60cd8fc
commit 2433c1f68e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.07.06.143313" #define Cdrskin_timestamP "2011.07.06.143441"

26
libburn/toc.c
View File

@ -105,16 +105,14 @@ static void write_clonecd2(volatile struct toc *toc, int f)
void toc_find_modes(struct burn_drive *d) void toc_find_modes(struct burn_drive *d)
{ {
struct burn_read_opts o; int i, j;
int lba;
int i, j, ret;
struct buffer *mem = NULL; struct buffer *mem = NULL;
struct burn_toc_entry *e; struct burn_toc_entry *e;
BURN_ALLOC_MEM(mem, struct buffer, 1); /* ts A70519 : the code which needs this does not work with GNU/Linux 2.4 USB
int lba;
struct burn_read_opts o;
mem->bytes = 0;
mem->sectors = 1;
o.raw = 1; o.raw = 1;
o.c2errors = 0; o.c2errors = 0;
o.subcodes_audio = 1; o.subcodes_audio = 1;
@ -123,17 +121,18 @@ void toc_find_modes(struct burn_drive *d)
o.report_recovered_errors = 0; o.report_recovered_errors = 0;
o.transfer_damaged_blocks = 1; o.transfer_damaged_blocks = 1;
o.hardware_error_retries = 1; o.hardware_error_retries = 1;
*/
BURN_ALLOC_MEM_VOID(mem, struct buffer, 1);
mem->bytes = 0;
mem->sectors = 1;
for (i = 0; i < d->disc->sessions; i++) for (i = 0; i < d->disc->sessions; i++)
for (j = 0; j < d->disc->session[i]->tracks; j++) { for (j = 0; j < d->disc->session[i]->tracks; j++) {
struct burn_track *t = d->disc->session[i]->track[j]; struct burn_track *t = d->disc->session[i]->track[j];
e = t->entry; e = t->entry;
if (!e)
lba = 0;
else
lba = burn_msf_to_lba(e->pmin, e->psec,
e->pframe);
/* XXX | in the subcodes if appropriate! */ /* XXX | in the subcodes if appropriate! */
if (e && !(e->control & 4)) { if (e && !(e->control & 4)) {
t->mode = BURN_AUDIO; t->mode = BURN_AUDIO;
@ -142,6 +141,11 @@ void toc_find_modes(struct burn_drive *d)
t->mode = BURN_MODE1; t->mode = BURN_MODE1;
/* ts A70519 : this does not work with GNU/Linux 2.4 USB because one cannot /* ts A70519 : this does not work with GNU/Linux 2.4 USB because one cannot
predict the exact dxfer_size without knowing the sector type. predict the exact dxfer_size without knowing the sector type.
if (!e)
lba = 0;
else
lba = burn_msf_to_lba(e->pmin, e->psec,
e->pframe);
mem->sectors = 1; mem->sectors = 1;
d->read_sectors(d, lba, mem.sectors, &o, mem); d->read_sectors(d, lba, mem.sectors, &o, mem);
t->mode = sector_identify(mem->data); t->mode = sector_identify(mem->data);