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

Added final message to image read pacifier

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-07 07:43:34 +00:00
parent d5be6efce0
commit ddd9fc92e4
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libisoburn/trunk/xorriso/xorriso.c
View File

@ -3209,7 +3209,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag)
Is ignored if <=0. Is ignored if <=0.
@param current_object A string telling the object currently processed. @param current_object A string telling the object currently processed.
Ignored if "". Ignored if "".
@param flag Bitfield. Unused yet. Submit 0. @param flag bit0= report unconditionally, no time check
*/ */
int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done, int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
off_t count, off_t todo, char *current_object, off_t count, off_t todo, char *current_object,
@ -3218,10 +3218,13 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
double current_time, since; double current_time, since;
current_time= Sfile_microtime(0); current_time= Sfile_microtime(0);
if(current_time - xorriso->last_update_time < xorriso->pacifier_interval) if(current_time - xorriso->last_update_time < xorriso->pacifier_interval
&& !(flag&1))
return(1); return(1);
xorriso->last_update_time= Sfile_microtime(0); xorriso->last_update_time= Sfile_microtime(0);
since= current_time - xorriso->start_time; since= current_time - xorriso->start_time;
if((flag&1)&&since<1.0)
since= 1.0;
if(count<=0.0) { if(count<=0.0) {
if(current_object[0]==0) if(current_object[0]==0)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,

2
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -292,7 +292,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag);
Is ignored if <=0. Is ignored if <=0.
@param current_object A string telling the object currently processed. @param current_object A string telling the object currently processed.
Ignored if "". Ignored if "".
@param flag Bitfield. Unused yet. Submit 0. @param flag bit0= report unconditionally, no time check
*/ */
int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done, int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
off_t count, off_t todo, char *current_object, off_t count, off_t todo, char *current_object,

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.06.214426" #define Xorriso_timestamP "2008.02.07.074248"

2
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -554,6 +554,8 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 3; goto ex; ret= 3; goto ex;
} }
Xorriso_pacifier_callback(xorriso, "nodes read", xorriso->pacifier_count, 0,
"", 1); /* report end count */
xorriso->in_volset_handle= (void *) volset; xorriso->in_volset_handle= (void *) volset;
Xorriso_set_image_severities(xorriso, 0); Xorriso_set_image_severities(xorriso, 0);
Xorriso_update_volid(xorriso, 0); Xorriso_update_volid(xorriso, 0);