Reacted on warnings of Debian buildd

1.2.2
Thomas Schmitt 11 years ago
parent 38fcbec963
commit 7c158963c1
  1. 2
      cdrskin/cdrskin_timestamp.h
  2. 7
      libburn/spc.c
  3. 11
      libburn/write.c

@ -1 +1 @@
#define Cdrskin_timestamP "2012.01.27.150951"
#define Cdrskin_timestamP "2012.02.02.190720"

@ -1705,7 +1705,7 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
int loop_count, int flag)
{
enum response outcome;
int done = -1, usleep_time, ret;
int done = -1, usleep_time;
char *msg = NULL;
if (burn_sg_log_scsi & 3)
@ -1732,7 +1732,9 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
}
if (time(NULL) + usleep_time / 1000000 - start_time >
timeout_ms / 1000 + 1) {
BURN_ALLOC_MEM(msg, char, 320);
done = -1; /* In case of alloc failure */
BURN_ALLOC_MEM_VOID(msg, char, 320);
done = 1;
sprintf(msg,
"Timeout exceed (%d ms). Retry canceled.\n",
timeout_ms);
@ -1740,7 +1742,6 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
0x0002018a,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 0);
done = 1;
goto err_ex;
}
if (d->cancel)

@ -455,7 +455,7 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
struct burn_session *session,
int nwa)
{
int i, m, s, f, form, pform, runtime = -150, ret, track_length;
int i, m, s, f, form, runtime = -150, ret, track_length;
int leadin_form, leadin_start, pregap = 150, postgap;
unsigned char ctladr, scms;
struct burn_drive *d;
@ -469,6 +469,8 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
#ifdef Libburn_track_multi_indeX
int j;
#else
int pform;
#endif
if (ntr < 1) {
@ -600,7 +602,10 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
if (tar[0]->pregap2_size < 150)
tar[0]->pregap2_size = 150;
#ifndef Libburn_track_multi_indeX
pform = form;
#endif
for (i = 0; i < ntr; i++) {
/* ts A70125 :
@ -788,7 +793,11 @@ XXX this is untested :)
rem -= burn_sector_length(tar[i]->mode);
runtime--;
}
#ifndef Libburn_track_multi_indeX
pform = form;
#endif
}
burn_lba_to_msf(runtime, &m, &s, &f);
e[2].pmin = m;

Loading…
Cancel
Save