From 9f5e6c925ae71057d378552b87a9d0a34e45fd99 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 23 Jan 2012 10:40:59 +0000
Subject: [PATCH] Reporting speed with -check_md5, -compare, -find, -compare_l,
 -update

---
 xorriso/drive_mgt.c         | 2 +-
 xorriso/opts_a_c.c          | 4 ++--
 xorriso/opts_d_h.c          | 2 +-
 xorriso/opts_i_o.c          | 2 +-
 xorriso/opts_p_z.c          | 2 +-
 xorriso/read_run.c          | 2 +-
 xorriso/xorriso_timestamp.h | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c
index 5b54554e..4be238c9 100644
--- a/xorriso/drive_mgt.c
+++ b/xorriso/drive_mgt.c
@@ -2011,7 +2011,7 @@ int Xorriso_check_md5_range(struct XorrisO *xorriso, off_t start_lba,
    xorriso->pacifier_count+= data_count; 
    xorriso->pacifier_byte_count+= data_count;
    Xorriso_pacifier_callback(xorriso, "content bytes read",
-                             xorriso->pacifier_count, 0, "", 0);
+                             xorriso->pacifier_count, 0, "", 8);
  }
  iso_md5_end(&ctx, data_md5);
  ret= 1;
diff --git a/xorriso/opts_a_c.c b/xorriso/opts_a_c.c
index e9f5fb3f..484e5971 100644
--- a/xorriso/opts_a_c.c
+++ b/xorriso/opts_a_c.c
@@ -1368,7 +1368,7 @@ ex:;
    xorriso->pacifier_interval= mem_pci;
    if(mem_lut!=xorriso->last_update_time && !(flag&2))
      Xorriso_pacifier_callback(xorriso, "content bytes read",
-                               xorriso->pacifier_count, 0, "", 1);
+                               xorriso->pacifier_count, 0, "", 1 | 8 | 32);
  }
  if(do_report) {
    if(optc == 0) {
@@ -1943,7 +1943,7 @@ int Xorriso_option_compare(struct XorrisO *xorriso, char *disk_path,
  xorriso->pacifier_interval= mem_pci;
  if(mem_lut!=xorriso->last_update_time && !(flag&2))
    Xorriso_pacifier_callback(xorriso, "content bytes read",
-                             xorriso->pacifier_count, 0, "", 1);
+                             xorriso->pacifier_count, 0, "", 1 | 8 | 32);
 report_outcome:;
  if(ret>0) {
    sprintf(xorriso->result_line,
diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c
index e5dcb57a..4dc8390d 100644
--- a/xorriso/opts_d_h.c
+++ b/xorriso/opts_d_h.c
@@ -1117,7 +1117,7 @@ ex:;
                              xorriso->pacifier_count, 0, "", 1 | 2);
  else if(mem_lut!=xorriso->last_update_time && mem_lut!=0.0 && !(flag&2))
    Xorriso_pacifier_callback(xorriso, "content bytes read",
-                             xorriso->pacifier_count, 0, "", 1);
+                             xorriso->pacifier_count, 0, "", 1 | 8 | 32);
  if(first_job->action == 35 && !(flag & 1))
    Xorriso_report_md5_outcome(xorriso, first_job->target, 0);
  if(first_job->action == 40) {
diff --git a/xorriso/opts_i_o.c b/xorriso/opts_i_o.c
index f3ece124..090b7b5c 100644
--- a/xorriso/opts_i_o.c
+++ b/xorriso/opts_i_o.c
@@ -617,7 +617,7 @@ int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
                              xorriso->pacifier_total, "", 1);
  else if(mode==1 || mode==2)
    Xorriso_pacifier_callback(xorriso, "content bytes read",
-                             xorriso->pacifier_count, 0, "", 1);
+                             xorriso->pacifier_count, 0, "", 1 | 8 | 32);
  else if(mode==3)
    Xorriso_pacifier_callback(xorriso, "files restored",xorriso->pacifier_count,
                              xorriso->pacifier_total, "", 1|4);
diff --git a/xorriso/opts_p_z.c b/xorriso/opts_p_z.c
index fb04c0de..4660ec3c 100644
--- a/xorriso/opts_p_z.c
+++ b/xorriso/opts_p_z.c
@@ -1669,7 +1669,7 @@ int Xorriso_option_update(struct XorrisO *xorriso, char *disk_path,
  xorriso->pacifier_interval= mem_pci;
  if(mem_lut!=xorriso->last_update_time && !(flag & (2 | 4)))
    Xorriso_pacifier_callback(xorriso, "content bytes read",
-                             xorriso->pacifier_count, 0, "", 1);
+                             xorriso->pacifier_count, 0, "", 1 | 8 | 32);
 report_outcome:;
  if(ret>0) {
    sprintf(xorriso->info_text,
diff --git a/xorriso/read_run.c b/xorriso/read_run.c
index 3e2ce4fa..a8ff92ea 100644
--- a/xorriso/read_run.c
+++ b/xorriso/read_run.c
@@ -2088,7 +2088,7 @@ int Xorriso_check_md5(struct XorrisO *xorriso, void *in_node, char *path,
    xorriso->pacifier_count+= rret; 
    xorriso->pacifier_byte_count+= rret;
    Xorriso_pacifier_callback(xorriso, "content bytes read",
-                             xorriso->pacifier_count, 0, "", 0);
+                             xorriso->pacifier_count, 0, "", 8);
    ret= Xorriso_check_for_abort(
              xorriso,
              xorriso->check_media_default != NULL 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 9edaa7c3..b76d2c76 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.01.21.114233"
+#define Xorriso_timestamP "2012.01.21.173229"