dvd-sector-copy.c: Split up the things which used to be in `struct source'.

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index 6fec2deaaa863377d617ed3e97683f3a20be6341..b2fa8818bce9cc4959d92d47af309d5fc6ab0178 100644 (file)
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -292,17 +292,12 @@ static void print_progress(const char *fmt, ...)
   va_end(ap);
 }
 
   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;
 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)
 {
 
 static void report_progress(secaddr pos)
 {


@@ -369,6 +364,11 @@ static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err)
   fflush(stdout);
 }
 
   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;
 static ssize_t read_sectors(secaddr pos, void *buf, secaddr want)
 {
   ssize_t n;