From eb061ad90afc5da082978449a4a8dd5a0732da16 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 16 Feb 2022 18:55:24 +0000
Subject: [PATCH 1/1] dvd-sector-copy.c: Split up the things which used to be
 in `struct source'.

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

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index 6fec2de..b2fa881 100644
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -292,17 +292,12 @@ static void print_progress(const char *fmt, ...)
   va_end(ap);
 }
 
-static dvd_reader_t *dvd;
-static int dvdfd = -1;
-static struct file *file;
-static dvd_file_t *vob;
-
 unsigned flags;
 #  define F_ALLPROGRESS 1u
 static secaddr last_pos, limit, nsectors, ndone;
 static struct timeval last_time;
 static double wsum, wcount;
-static const char *mapfile; static FILE *mapfp;
+static struct file *file;
 
 static void report_progress(secaddr pos)
 {
@@ -369,6 +364,11 @@ static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err)
   fflush(stdout);
 }
 
+static dvd_reader_t *dvd;
+static int dvdfd = -1;
+static dvd_file_t *vob;
+static const char *mapfile; static FILE *mapfp;
+
 static ssize_t read_sectors(secaddr pos, void *buf, secaddr want)
 {
   ssize_t n;
-- 
2.11.0