Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #438 from PartialVolume/PDFGen11

Browse Source 
PDFGen11 - further work on PDF certificate
This commit is contained in:
PartialVolume
2023-02-22 16:28:42 +00:00
committed by GitHub
parent 09e41d573f 3b952d3f92
commit 40f1e31225
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pass.c
View File

@@ -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. */