From 06b2bcfe55f6fbedbefa8d3bd54369b174edb319 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 18 Feb 2022 18:54:54 +0000
Subject: [PATCH] dvd-sector-copy.c: Sink `report_bad_blocks_progress' towards
 recovery.

---
 dvd-sector-copy.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index bbe0c10..ff4e54a 100644
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -379,18 +379,6 @@ static void report_progress(secaddr pos)
 #undef BETA
 }
 
-static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err)
-{
-  report_progress(hi);
-
-  if (lo == hi) append_progress(": retrying bad sector");
-  else
-    append_progress(": %"PRIuSEC" bad %s",
-		    hi - lo, hi == lo + 1 ? "sector" : "sectors");
-  if (err != EIO) append_progress(" (%s)", strerror(err));
-  fflush(stdout);
-}
-
 static dvd_reader_t *dvd;
 static int dvdfd = -1, outfd = -1;
 static dvd_file_t *vob;
@@ -466,6 +454,18 @@ static ssize_t read_sectors(secaddr pos, void *buf, secaddr want)
   return (!done && errno ? -1 : done);
 }
 
+static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err)
+{
+  report_progress(hi);
+
+  if (lo == hi) append_progress(": retrying bad sector");
+  else
+    append_progress(": %"PRIuSEC" bad %s",
+		    hi - lo, hi == lo + 1 ? "sector" : "sectors");
+  if (err && err != EIO) append_progress(" (%s)", strerror(err));
+  fflush(stdout);
+}
+
 static ssize_t find_good_sector(secaddr *pos_inout, secaddr end,
 				unsigned char *buf, secaddr sz)
 {
-- 
2.11.0