diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs index e8b29a40..7784d98a 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs @@ -1,5 +1,7 @@ using System; using System.IO; +using System.Threading; +using System.Threading.Tasks; using SharpCompress.Common.Rar.Headers; using size_t = System.UInt32; @@ -23,11 +25,11 @@ internal partial class Unpack : IRarUnpack // NOTE: caller has logic to check for -1 for error we throw instead. readStream.Read(buf, offset, count); - private async System.Threading.Tasks.Task UnpIO_UnpReadAsync( + private async Task UnpIO_UnpReadAsync( byte[] buf, int offset, int count, - System.Threading.CancellationToken cancellationToken = default + CancellationToken cancellationToken = default ) => // NOTE: caller has logic to check for -1 for error we throw instead. await readStream.ReadAsync(buf, offset, count, cancellationToken).ConfigureAwait(false); @@ -35,11 +37,11 @@ internal partial class Unpack : IRarUnpack private void UnpIO_UnpWrite(byte[] buf, size_t offset, uint count) => writeStream.Write(buf, checked((int)offset), checked((int)count)); - private async System.Threading.Tasks.Task UnpIO_UnpWriteAsync( + private async Task UnpIO_UnpWriteAsync( byte[] buf, size_t offset, uint count, - System.Threading.CancellationToken cancellationToken = default + CancellationToken cancellationToken = default ) => await writeStream .WriteAsync(buf, checked((int)offset), checked((int)count), cancellationToken) @@ -66,11 +68,11 @@ internal partial class Unpack : IRarUnpack DoUnpack(); } - public async System.Threading.Tasks.Task DoUnpackAsync( + public async Task DoUnpackAsync( FileHeader fileHeader, Stream readStream, Stream writeStream, - System.Threading.CancellationToken cancellationToken = default + CancellationToken cancellationToken = default ) { DestUnpSize = fileHeader.UncompressedSize; @@ -97,9 +99,7 @@ internal partial class Unpack : IRarUnpack } } - public async System.Threading.Tasks.Task DoUnpackAsync( - System.Threading.CancellationToken cancellationToken = default - ) + public async Task DoUnpackAsync(CancellationToken cancellationToken = default) { if (fileHeader.IsStored) { @@ -133,9 +133,7 @@ internal partial class Unpack : IRarUnpack } while (!Suspended); } - private async System.Threading.Tasks.Task UnstoreFileAsync( - System.Threading.CancellationToken cancellationToken = default - ) + private async Task UnstoreFileAsync(CancellationToken cancellationToken = default) { var buffer = new byte[(int)Math.Min(0x10000, DestUnpSize)]; do diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack_cpp.cs index 0fe817a6..c518e11e 100644 --- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack_cpp.cs +++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack_cpp.cs @@ -2,6 +2,8 @@ using System; using System.Buffers; +using System.Threading; +using System.Threading.Tasks; using SharpCompress.Common; using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef; using static SharpCompress.Compressors.Rar.UnpackV2017.UnpackGlobal; @@ -196,10 +198,10 @@ internal sealed partial class Unpack : BitInput } } - private async System.Threading.Tasks.Task DoUnpackAsync( + private async Task DoUnpackAsync( uint Method, bool Solid, - System.Threading.CancellationToken cancellationToken = default + CancellationToken cancellationToken = default ) { // Methods <50 will crash in Fragmented mode when accessing NULL Window.