From 3b52562d97d9f9618c919a5465db3fe96c334e0e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 25 Aug 2016 20:51:30 +0000 Subject: [PATCH] Corrected block count messages with -check_media sector_map= --- xorriso/drive_mgt.c | 6 ++++-- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c index f594d67f..5ea63f89 100644 --- a/xorriso/drive_mgt.c +++ b/xorriso/drive_mgt.c @@ -2685,7 +2685,7 @@ int Xorriso_check_interval(struct XorrisO *xorriso, struct SpotlisT *spotlist, struct burn_drive *drive; struct burn_drive_info *dinfo; char *data= NULL, *data_pt; - off_t data_count, to_read, read_count= 0, write_amount; + off_t data_count, to_read, read_count= 0, write_amount, skipped_to_read; double pre_read_time, post_read_time, time_diff, total_time_diff= 0; double last_abort_file_time= 0; void *ctx= NULL; @@ -2838,6 +2838,7 @@ abort_check:; } to_read= read_chunk; + skipped_to_read= 0; suspect_tao_end= 0; if(i + to_read > block_count) to_read= block_count - i; @@ -2875,6 +2876,7 @@ abort_check:; if(skip_reading) { pre_read_time= post_read_time= Sfile_microtime(0); + skipped_to_read= to_read; } else { data_count= 0; pre_read_time= Sfile_microtime(0); @@ -2986,7 +2988,7 @@ failed_to_write:; prev_quality= quality; } if(!(flag & 2)) { - xorriso->pacifier_count+= to_read; + xorriso->pacifier_count+= to_read - skipped_to_read; if(post_read_time - xorriso->last_update_time >= xorriso->pacifier_interval) Xorriso_pacifier_callback(xorriso, "blocks read", diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 7b10e38a..9bd29b61 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2016.08.20.085236" +#define Xorriso_timestamP "2016.08.25.205059"