From 27e60e7a4c737f4caeba5d9225809e4b855571ed Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 9 Apr 2022 17:26:32 +0100
Subject: [PATCH] dvd-sector-copy.c: Fold loop initialization into the `for'
 satatement.

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

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index 89980a9..9dbdb81 100644
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -1093,8 +1093,7 @@ int main(int argc, char *argv[])
 
   qsort(eventq.v, eventq.n, sizeof(struct event), compare_event);
 
-  f &= ~f_write; start = 0;
-  for (i = 0; i < eventq.n; i++) {
+  for (i = 0, f &= ~f_write, start = 0; i < eventq.n; i++) {
     ev = &eventq.v[i];
     switch (ev->ev) {
       case EV_WRITE:
@@ -1113,8 +1112,7 @@ int main(int argc, char *argv[])
 #ifdef DEBUG
   dump_eventq("initial");
 #endif
-  f &= ~f_write; start = 0;
-  for (i = 0; i < eventq.n; i++) {
+  for (i = 0, f &= ~f_write, start = 0; i < eventq.n; i++) {
     ev = &eventq.v[i];
     if (ev->ev == EV_WRITE) { start = ev->pos; f |= f_write; }
     if (ev->pos >= limit) break;
@@ -1151,8 +1149,7 @@ int main(int argc, char *argv[])
 #ifdef DEBUG
   printf("\n;; event sweep:\n");
 #endif
-  f &= ~f_write;
-  for (pos = 0, i = 0; i < eventq.n; i++) {
+  for (pos = 0, i = 0, f &= ~f_write; i < eventq.n; i++) {
     ev = &eventq.v[i];
     if (ev->pos > pos) {
       if (f&f_write) emit(pos, ev->pos);
-- 
2.11.0