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

Reacted on warnings of PLD Linux build log

Browse Source
This commit is contained in:
Thomas Schmitt 2013-09-05 08:49:31 +00:00
parent 2a8ae1be42
commit cc8ac3aefb
3 changed files with 26 additions and 14 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 "2013.09.04.141706" #define Cdrskin_timestamP "2013.09.05.084834"

4
libburn/file.c
View File

@ -937,7 +937,7 @@ int burn_drive_extract_audio(struct burn_drive *drive,
char *target_path, int flag) char *target_path, int flag)
{ {
int fd = -1, ret, todo, sector_no, val, min, sec, fr; int fd = -1, ret, todo, sector_no, val, min, sec, fr;
int sectors_done= 0, last_reported = 0; int sectors_done= 0;
off_t data_size, data_count = 0; off_t data_size, data_count = 0;
time_t last_pacified = 0, now; time_t last_pacified = 0, now;
char *msg = NULL, *buf = NULL; char *msg = NULL, *buf = NULL;
@ -1023,7 +1023,6 @@ write_error:;
LIBDAX_MSGS_SEV_UPDATE, LIBDAX_MSGS_SEV_UPDATE,
LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 1); msg, 0, 1);
last_reported = sectors_done;
} }
} }
if ((flag & 1)) { if ((flag & 1)) {
@ -1035,7 +1034,6 @@ write_error:;
LIBDAX_MSGS_SEV_UPDATE, LIBDAX_MSGS_SEV_UPDATE,
LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 0); msg, 0, 0);
last_reported = sectors_done;
} }
ret = 1; ret = 1;
ex:; ex:;

34
libburn/mmc.c
View File

@ -2454,8 +2454,11 @@ int mmc_read_cd_msf(struct burn_drive *d,
const struct burn_read_opts *o, struct buffer *buf, int flag) const struct burn_read_opts *o, struct buffer *buf, int flag)
{ {
int req, ret, dap_bit; int req, ret, dap_bit;
int report_recovered_errors = 0, subcodes_audio = 0, subcodes_data = 0; int subcodes_audio = 0, subcodes_data = 0;
struct command *c; struct command *c;
#ifdef Libburn_mmc_report_recovereD
int report_recovered_errors = 0;
#endif
c = &(d->casual_command); c = &(d->casual_command);
mmc_start_if_needed(d, 0); mmc_start_if_needed(d, 0);
@ -2464,10 +2467,13 @@ int mmc_read_cd_msf(struct burn_drive *d,
dap_bit = flag & 1; dap_bit = flag & 1;
if (o != NULL) { if (o != NULL) {
report_recovered_errors = o->report_recovered_errors;
subcodes_audio = o->subcodes_audio; subcodes_audio = o->subcodes_audio;
subcodes_data = o->subcodes_data; subcodes_data = o->subcodes_data;
dap_bit |= o->dap_bit; dap_bit |= o->dap_bit;
#ifdef Libburn_mmc_report_recovereD
report_recovered_errors = o->report_recovered_errors;
#endif
} }
scsi_init_command(c, MMC_READ_CD_MSF, sizeof(MMC_READ_CD_MSF)); scsi_init_command(c, MMC_READ_CD_MSF, sizeof(MMC_READ_CD_MSF));
@ -2482,11 +2488,12 @@ int mmc_read_cd_msf(struct burn_drive *d,
req = main_ch & 0xf8; req = main_ch & 0xf8;
/* ts A61106 : LG GSA-4082B dislikes this. key=5h asc=24h ascq=00h #ifdef Libburn_mmc_report_recovereD
/* ts A61106 : LG GSA-4082B dislikes this. key=5h asc=24h ascq=00h */
if (d->busy == BURN_DRIVE_GRABBING || report_recovered_errors) if (d->busy == BURN_DRIVE_GRABBING || report_recovered_errors)
req |= 2; req |= 2;
*/ #endif /* Libburn_mmc_report_recovereD */
c->opcode[9] = req; c->opcode[9] = req;
c->opcode[10] = 0; c->opcode[10] = 0;
@ -2530,9 +2537,13 @@ int mmc_read_cd(struct burn_drive *d, int start, int len,
const struct burn_read_opts *o, struct buffer *buf, int flag) const struct burn_read_opts *o, struct buffer *buf, int flag)
{ {
int temp, req, ret, dap_bit; int temp, req, ret, dap_bit;
int report_recovered_errors = 0, subcodes_audio = 0, subcodes_data = 0; int subcodes_audio = 0, subcodes_data = 0;
struct command *c; struct command *c;
#ifdef Libburn_mmc_report_recovereD
int report_recovered_errors = 0;
#endif
/* # define Libburn_read_cd_by_msF 1 */ /* # define Libburn_read_cd_by_msF 1 */
#ifdef Libburn_read_cd_by_msF #ifdef Libburn_read_cd_by_msF
@ -2554,10 +2565,13 @@ int mmc_read_cd(struct burn_drive *d, int start, int len,
dap_bit = flag & 1; dap_bit = flag & 1;
if (o != NULL) { if (o != NULL) {
report_recovered_errors = o->report_recovered_errors;
subcodes_audio = o->subcodes_audio; subcodes_audio = o->subcodes_audio;
subcodes_data = o->subcodes_data; subcodes_data = o->subcodes_data;
dap_bit |= o->dap_bit; dap_bit |= o->dap_bit;
#ifdef Libburn_mmc_report_recovereD
report_recovered_errors = o->report_recovered_errors;
#endif
} }
scsi_init_command(c, MMC_READ_CD, sizeof(MMC_READ_CD)); scsi_init_command(c, MMC_READ_CD, sizeof(MMC_READ_CD));
@ -2578,11 +2592,11 @@ int mmc_read_cd(struct burn_drive *d, int start, int len,
c->opcode[6] = len & 0xFF; c->opcode[6] = len & 0xFF;
req = main_ch & 0xf8; req = main_ch & 0xf8;
/* ts A61106 : LG GSA-4082B dislikes this. key=5h asc=24h ascq=00h #ifdef Libburn_mmc_report_recovereD
/* ts A61106 : LG GSA-4082B dislikes this. key=5h asc=24h ascq=00h */
if (d->busy == BURN_DRIVE_GRABBING || report_recovered_errors) if (d->busy == BURN_DRIVE_GRABBING || report_recovered_errors)
req |= 2; req |= 2;
*/ #endif /* Libburn_mmc_report_recovereD */
c->opcode[9] = req; c->opcode[9] = req;
c->opcode[10] = 0; c->opcode[10] = 0;