[Aaru.Checksums] Reformat and cleanup.

This commit is contained in:
2023-10-03 22:45:06 +01:00
parent 03a488e834
commit 3429b9012b
28 changed files with 2656 additions and 2416 deletions

View File

@@ -67,6 +67,8 @@ public sealed class Fletcher32Context : IChecksum
_useNative = _nativeContext != IntPtr.Zero;
}
#region IChecksum Members
/// <inheritdoc />
/// <summary>Updates the hash with data.</summary>
/// <param name="data">Data buffer.</param>
@@ -82,7 +84,7 @@ public sealed class Fletcher32Context : IChecksum
/// <summary>Returns a byte array of the hash value.</summary>
public byte[] Final()
{
uint finalSum = (uint)((_sum2 << 16) | _sum1);
var finalSum = (uint)(_sum2 << 16 | _sum1);
if(!_useNative)
return BigEndianBitConverter.GetBytes(finalSum);
@@ -97,7 +99,7 @@ public sealed class Fletcher32Context : IChecksum
/// <summary>Returns a hexadecimal representation of the hash value.</summary>
public string End()
{
uint finalSum = (uint)((_sum2 << 16) | _sum1);
var finalSum = (uint)(_sum2 << 16 | _sum1);
if(_useNative)
{
@@ -107,12 +109,14 @@ public sealed class Fletcher32Context : IChecksum
var fletcherOutput = new StringBuilder();
for(int i = 0; i < BigEndianBitConverter.GetBytes(finalSum).Length; i++)
for(var i = 0; i < BigEndianBitConverter.GetBytes(finalSum).Length; i++)
fletcherOutput.Append(BigEndianBitConverter.GetBytes(finalSum)[i].ToString("x2"));
return fletcherOutput.ToString();
}
#endregion
[DllImport("libAaru.Checksums.Native", SetLastError = true)]
static extern IntPtr fletcher32_init();
@@ -126,7 +130,7 @@ public sealed class Fletcher32Context : IChecksum
static extern void fletcher32_free(IntPtr ctx);
static void Step(ref ushort previousSum1, ref ushort previousSum2, byte[] data, uint len, bool useNative,
IntPtr nativeContext)
IntPtr nativeContext)
{
if(useNative)
{
@@ -151,7 +155,7 @@ public sealed class Fletcher32Context : IChecksum
uint sum1 = previousSum1;
uint sum2 = previousSum2;
int dataOff = 0;
var dataOff = 0;
switch(len)
{
@@ -329,8 +333,8 @@ public sealed class Fletcher32Context : IChecksum
ushort localSum1 = 0xFFFF;
ushort localSum2 = 0xFFFF;
byte[] buffer = new byte[65536];
int read = fileStream.EnsureRead(buffer, 0, 65536);
var buffer = new byte[65536];
int read = fileStream.EnsureRead(buffer, 0, 65536);
while(read > 0)
{
@@ -339,7 +343,7 @@ public sealed class Fletcher32Context : IChecksum
read = fileStream.EnsureRead(buffer, 0, 65536);
}
uint finalSum = (uint)((localSum2 << 16) | localSum1);
var finalSum = (uint)(localSum2 << 16 | localSum1);
if(useNative)
{
@@ -381,7 +385,7 @@ public sealed class Fletcher32Context : IChecksum
Step(ref localSum1, ref localSum2, data, len, useNative, nativeContext);
uint finalSum = (uint)((localSum2 << 16) | localSum1);
var finalSum = (uint)(localSum2 << 16 | localSum1);
if(useNative)
{
@@ -429,6 +433,8 @@ public sealed class Fletcher16Context : IChecksum
_useNative = _nativeContext != IntPtr.Zero;
}
#region IChecksum Members
/// <inheritdoc />
/// <summary>Updates the hash with data.</summary>
/// <param name="data">Data buffer.</param>
@@ -444,7 +450,7 @@ public sealed class Fletcher16Context : IChecksum
/// <summary>Returns a byte array of the hash value.</summary>
public byte[] Final()
{
ushort finalSum = (ushort)((_sum2 << 8) | _sum1);
var finalSum = (ushort)(_sum2 << 8 | _sum1);
if(!_useNative)
return BigEndianBitConverter.GetBytes(finalSum);
@@ -459,7 +465,7 @@ public sealed class Fletcher16Context : IChecksum
/// <summary>Returns a hexadecimal representation of the hash value.</summary>
public string End()
{
ushort finalSum = (ushort)((_sum2 << 8) | _sum1);
var finalSum = (ushort)(_sum2 << 8 | _sum1);
if(_useNative)
{
@@ -469,12 +475,14 @@ public sealed class Fletcher16Context : IChecksum
var fletcherOutput = new StringBuilder();
for(int i = 0; i < BigEndianBitConverter.GetBytes(finalSum).Length; i++)
for(var i = 0; i < BigEndianBitConverter.GetBytes(finalSum).Length; i++)
fletcherOutput.Append(BigEndianBitConverter.GetBytes(finalSum)[i].ToString("x2"));
return fletcherOutput.ToString();
}
#endregion
[DllImport("libAaru.Checksums.Native", SetLastError = true)]
static extern IntPtr fletcher16_init();
@@ -488,7 +496,7 @@ public sealed class Fletcher16Context : IChecksum
static extern void fletcher16_free(IntPtr ctx);
static void Step(ref byte previousSum1, ref byte previousSum2, byte[] data, uint len, bool useNative,
IntPtr nativeContext)
IntPtr nativeContext)
{
if(useNative)
{
@@ -499,7 +507,7 @@ public sealed class Fletcher16Context : IChecksum
uint sum1 = previousSum1;
uint sum2 = previousSum2;
int dataOff = 0;
var dataOff = 0;
switch(len)
{
@@ -657,8 +665,8 @@ public sealed class Fletcher16Context : IChecksum
byte localSum1 = 0xFF;
byte localSum2 = 0xFF;
byte[] buffer = new byte[65536];
int read = fileStream.EnsureRead(buffer, 0, 65536);
var buffer = new byte[65536];
int read = fileStream.EnsureRead(buffer, 0, 65536);
while(read > 0)
{
@@ -667,7 +675,7 @@ public sealed class Fletcher16Context : IChecksum
read = fileStream.EnsureRead(buffer, 0, 65536);
}
ushort finalSum = (ushort)((localSum2 << 8) | localSum1);
var finalSum = (ushort)(localSum2 << 8 | localSum1);
if(useNative)
{
@@ -709,7 +717,7 @@ public sealed class Fletcher16Context : IChecksum
Step(ref localSum1, ref localSum2, data, len, useNative, nativeContext);
ushort finalSum = (ushort)((localSum2 << 8) | localSum1);
var finalSum = (ushort)(localSum2 << 8 | localSum1);
if(useNative)
{