From 0b093f0ccc0415239a255f4f086084e23dd6dad8 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 23 Jan 2009 17:28:02 +0000 Subject: [PATCH] Silenced a FAILURE message with -acl if no image is loaded --- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index c8133576..82c99ade 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.01.23.172652" +#define Xorriso_timestamP "2009.01.23.172757" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index 2ae7665c..3611d558 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -1706,11 +1706,14 @@ int Xorriso__read_pacifier(IsoImage *image, IsoFileSource *filesource) return(1); } - +/* @param flag bit0=silently return 0 if no volume/image is present +*/ int Xorriso_get_volume(struct XorrisO *xorriso, IsoImage **volume, int flag) { if(xorriso->in_volset_handle==NULL) { + if(flag & 1) + return(0); Xorriso_process_msg_queues(xorriso,0); sprintf(xorriso->info_text,"No ISO image present."); if(xorriso->indev[0]==0 && xorriso->outdev[0]==0) @@ -8871,7 +8874,7 @@ int Xorriso_set_ignore_aclea(struct XorrisO *xorriso, int flag) int ret; IsoImage *volume; - ret= Xorriso_get_volume(xorriso, &volume, 0); + ret= Xorriso_get_volume(xorriso, &volume, 1); if(ret<=0) return(ret); iso_image_set_ignore_aclea(volume,