From 3b952d3f92c80a4431f915bed8969688059e193f Mon Sep 17 00:00:00 2001
From: PartialVolume <22084881+PartialVolume@users.noreply.github.com>
Date: Wed, 22 Feb 2023 11:56:22 +0000
Subject: [PATCH] PDFGen11 - further work on PDF certificate

1. Fix a bug in the static and random pass code
where I unnecessarily moved the decrement of z (the
count of bytes remaining) to after the periodic sync
which meant every time it sync'ed z wasn't decremented due
to r being used as a general results variable for the
fdatasync function.

I prefer to just have a variable be responsible for just
one thing hence my assumption r wasn't used for two different
things.

Changed the position of the decrement of z, pass_done and
round_done to their original position prior to the periodic
sync.
---
 src/pass.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/pass.c b/src/pass.c
index f3a3f15..01a8c87 100644
--- a/src/pass.c
+++ b/src/pass.c
@@ -391,6 +391,13 @@ int nwipe_random_pass( NWIPE_METHOD_SIGNATURE )
 
         } /* partial write */
 
+        /* Decrement the bytes remaining in this pass. */
+        z -= r;
+
+        /* Increment the total progress counters. */
+        c->pass_done += r;
+        c->round_done += r;
+
         /* Perodic Sync */
         if( syncRate > 0 )
         {
@@ -427,19 +434,12 @@ int nwipe_random_pass( NWIPE_METHOD_SIGNATURE )
 
         pthread_testcancel();
 
-        /* Decrement the bytes remaining in this pass. */
-        z -= r;
-
         /* If statement required so that it does not reset on subsequent passes */
         if( c->bytes_erased < ( c->device_size - z ) )  // How much of the device has been erased?
         {
             c->bytes_erased = c->device_size - z;
         }
 
-        /* Increment the total progress counters. */
-        c->pass_done += r;
-        c->round_done += r;
-
     } /* remaining bytes */
 
     /* Release the output buffer. */
@@ -834,6 +834,13 @@ int nwipe_static_pass( NWIPE_METHOD_SIGNATURE, nwipe_pattern_t* pattern )
          *   then ( w == 0 ) always.
          */
 
+        /* Decrement the bytes remaining in this pass. */
+        z -= r;
+
+        /* Increment the total progress counterr. */
+        c->pass_done += r;
+        c->round_done += r;
+
         /* Perodic Sync */
         if( syncRate > 0 )
         {
@@ -870,18 +877,11 @@ int nwipe_static_pass( NWIPE_METHOD_SIGNATURE, nwipe_pattern_t* pattern )
 
         pthread_testcancel();
 
-        /* Decrement the bytes remaining in this pass. */
-        z -= r;
-
         if( c->bytes_erased < ( c->device_size - z ) )  // How much of the device has been erased?
         {
             c->bytes_erased = c->device_size - z;
         }
 
-        /* Increment the total progress counterr. */
-        c->pass_done += r;
-        c->round_done += r;
-
     } /* remaining bytes */
 
     /* Tell our parent that we are syncing the device. */