From bd24c8a60a7883c22ba5a84d2b6b801ee6ccf324 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 12 Sep 2007 11:57:49 +0000 Subject: [PATCH] Reacted on compiler -O2 warnings --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/mmc.c | 8 +++----- libburn/trunk/libburn/spc.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index b3fd1bef..59be71f3 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2007.09.12.104626" +#define Cdrskin_timestamP "2007.09.12.115850" diff --git a/libburn/trunk/libburn/mmc.c b/libburn/trunk/libburn/mmc.c index 9cd730df..47c062c9 100644 --- a/libburn/trunk/libburn/mmc.c +++ b/libburn/trunk/libburn/mmc.c @@ -376,7 +376,7 @@ int mmc_get_nwa(struct burn_drive *d, int trackno, int *lba, int *nwa) /* void mmc_close_disc(struct burn_drive *d, struct burn_write_opts *o) */ void mmc_close_disc(struct burn_write_opts *o) { - struct burn_drive *d; + struct burn_drive *d = o->drive; if (mmc_function_spy(d, "mmc_close_disc") <= 0) return; @@ -387,7 +387,6 @@ void mmc_close_disc(struct burn_write_opts *o) /* ts A61009 : made impossible by removing redundant parameter d */ /* a ssert(o->drive == d); */ - d = o->drive; o->multi = 0; spc_select_write_params(d, o); @@ -398,7 +397,7 @@ void mmc_close_disc(struct burn_write_opts *o) /* void mmc_close_session(struct burn_drive *d, struct burn_write_opts *o) */ void mmc_close_session(struct burn_write_opts *o) { - struct burn_drive *d; + struct burn_drive *d = o->drive; if (mmc_function_spy(d, "mmc_close_session") <= 0) return; @@ -409,7 +408,6 @@ void mmc_close_session(struct burn_write_opts *o) /* ts A61009 : made impossible by removing redundant parameter d */ /* a ssert(o->drive == d); */ - d = o->drive; o->multi = 3; spc_select_write_params(d, o); @@ -521,7 +519,7 @@ static int mmc_wait_for_buffer_free(struct burn_drive *d, struct buffer *buf) /* There is need to inquire the buffer fill */ d->pessimistic_writes++; min_fac = ((double) d->wfb_min_percent) / 100.0; - gettimeofday(&t0,&dummy_tz); + gettimeofday(&t0, &dummy_tz); #ifdef Libburn_mmc_wfb_debuG sleeplist[0]= 0; sprintf(sleeplist,"(%d%s %d)", diff --git a/libburn/trunk/libburn/spc.c b/libburn/trunk/libburn/spc.c index 564676e1..c8b0acc4 100644 --- a/libburn/trunk/libburn/spc.c +++ b/libburn/trunk/libburn/spc.c @@ -142,7 +142,7 @@ int spc_get_erase_progress(struct burn_drive *d) struct buffer b; if (mmc_function_spy(d, "get_erase_progress") <= 0) - return; + return 0; spc_request_sense(d, &b); return (b.data[16] << 8) | b.data[17];