From 1e10737a85d5da707372d2c390a737517e23cbab Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 10 Dec 2009 12:06:10 +0000 Subject: [PATCH] Silenced harmless compiler warning of FreeBSD 6.3 --- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index b93957a4..21a7ecb8 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.12.08.144237" +#define Xorriso_timestamP "2009.12.10.120734" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index c78a0228..2a58077c 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -966,7 +966,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag) int lba, track, session, params_flag, adr_mode, read_ret; uint32_t size; struct burn_drive_info *dinfo= NULL, *out_dinfo, *in_dinfo; - struct burn_drive *drive, *out_drive, *in_drive; + struct burn_drive *drive= NULL, *out_drive, *in_drive; enum burn_disc_status state; IsoImage *volset = NULL; IsoNode *root_node; @@ -1320,7 +1320,7 @@ ex: if(hretdo_calm_drive & 1) && !(flag & 64)) + if(drive != NULL && (xorriso->do_calm_drive & 1) && !(flag & 64)) burn_drive_snooze(drive, 0); /* No need to make noise from start */ } if(ropts!=NULL)