Skip to content

Commit 4dfc0bb

Browse files
NotOfficerNotOfficer
committed
no var
1 parent 296de27 commit 4dfc0bb

8 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎src/Zlib-ng.NET.Benchmarks/Program.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ public void Setup()
2626
Console.WriteLine($"Zlib-ng version: {_zlibng.GetVersionString()}");
2727

2828
const int count = 4_000_00;
29-
var randomBuffer = new byte[count * sizeof(long)]; // 3.2 MB
29+
byte[] randomBuffer = new byte[count * sizeof(long)]; // 3.2 MB
3030
var random = new Random(187);
31-
for (var i = 0; i < count; i += sizeof(long))
31+
for (int i = 0; i < count; i += sizeof(long))
3232
{
3333
Unsafe.WriteUnaligned(ref randomBuffer[i], random.NextInt64(0, 69));
3434
}
35-
var compressionBound = (int)_zlibng.CompressBound(randomBuffer.Length);
36-
var tmpBuffer = ArrayPool<byte>.Shared.Rent(compressionBound);
37-
var compressedSize = (uint)_zlibng.Compress2(tmpBuffer.AsSpan(0, compressionBound), randomBuffer, ZlibngCompressionLevel.Best);
38-
var compressionRatio = (double)randomBuffer.Length / compressedSize;
35+
int compressionBound = (int)_zlibng.CompressBound(randomBuffer.Length);
36+
byte[] tmpBuffer = ArrayPool<byte>.Shared.Rent(compressionBound);
37+
uint compressedSize = (uint)_zlibng.Compress2(tmpBuffer.AsSpan(0, compressionBound), randomBuffer, ZlibngCompressionLevel.Best);
38+
double compressionRatio = (double)randomBuffer.Length / compressedSize;
3939
Console.WriteLine("Compression ratio: {0}", compressionRatio.ToString("0.000", CultureInfo.InvariantCulture));
4040
_destBuffer = randomBuffer;
4141
_srcBuffer = new byte[compressedSize];
@@ -81,7 +81,7 @@ public static int Uncompress_SharpZipLib_Inflater(byte[] dest, byte[] src)
8181
{
8282
var inflater = new ICSharpCode.SharpZipLib.Zip.Compression.Inflater();
8383
inflater.SetInput(src);
84-
var result = inflater.Inflate(dest);
84+
int result = inflater.Inflate(dest);
8585
return result;
8686
}
8787

@@ -103,7 +103,7 @@ public static int Uncompress_DotnetZip_ZlibCodec(byte[] dest, byte[] src)
103103
AvailableBytesIn = src.Length,
104104
AvailableBytesOut = dest.Length
105105
};
106-
var result = codec.Inflate(Ionic.Zlib.FlushType.Full);
106+
int result = codec.Inflate(Ionic.Zlib.FlushType.Full);
107107
return result;
108108
}
109109

‎src/Zlib-ng.NET.Tests/Tests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ public async Task InitializeAsync()
1919
[Fact]
2020
public void CompressAndDecompress()
2121
{
22-
var randomString = GetRandomString(8192);
23-
var randomStringBuffer = Encoding.ASCII.GetBytes(randomString);
22+
string randomString = GetRandomString(8192);
23+
byte[] randomStringBuffer = Encoding.ASCII.GetBytes(randomString);
2424

25-
var compressedBufferSize = (int)_zlibng.CompressBound(randomStringBuffer.Length);
25+
int compressedBufferSize = (int)_zlibng.CompressBound(randomStringBuffer.Length);
2626
Assert.NotEqual(0, compressedBufferSize);
2727

28-
var compressedBuffer = new byte[compressedBufferSize];
28+
byte[] compressedBuffer = new byte[compressedBufferSize];
2929
var compressionResult = _zlibng.Compress(compressedBuffer, randomStringBuffer, out int compressedSize);
3030
Assert.Equal(ZlibngCompressionResult.Ok, compressionResult);
3131
Assert.NotEqual(0, compressedSize);
3232

33-
var decompressedBuffer = new byte[randomStringBuffer.Length];
33+
byte[] decompressedBuffer = new byte[randomStringBuffer.Length];
3434
var decompressionResult = _zlibng.Uncompress(decompressedBuffer, compressedBuffer.AsSpan(0, compressedSize), out int decompressedSize);
3535
Assert.Equal(ZlibngCompressionResult.Ok, decompressionResult);
3636
Assert.NotEqual(0, decompressedSize);
@@ -83,7 +83,7 @@ public static async Task<string> DownloadAsync()
8383
});
8484
using var response = await client.GetAsync(url);
8585
response.EnsureSuccessStatusCode();
86-
var filePath = Path.GetTempFileName();
86+
string filePath = Path.GetTempFileName();
8787
await using var fs = File.Create(filePath);
8888
await response.Content.CopyToAsync(fs);
8989
return filePath;

‎src/Zlib-ng.NET/Util.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static int GetReturnValue<T>(int result, T destLen) where T : IBinaryInte
2525

2626
public static unsafe string GetStringFromPtr(byte* ptr)
2727
{
28-
var span = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(ptr);
28+
ReadOnlySpan<byte> span = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(ptr);
2929
return span.Length == 0 ? "" : Encoding.UTF8.GetString(span);
3030
}
3131
}

‎src/Zlib-ng.NET/Zlibng.Compress.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public int Compress(Span<byte> dest, ReadOnlySpan<byte> source)
4747
fixed (byte* destPtr = dest)
4848
fixed (byte* sourcePtr = source)
4949
{
50-
var destLen = (nint)dest.Length;
51-
var sourceLen = (nint)source.Length;
52-
var result = CompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
50+
IntPtr destLen = (nint)dest.Length;
51+
IntPtr sourceLen = (nint)source.Length;
52+
ZlibngCompressionResult result = CompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
5353
return Util.GetReturnValue(result, destLen);
5454
}
5555
}
@@ -86,9 +86,9 @@ public ZlibngCompressionResult Compress<T>(Span<byte> dest, ReadOnlySpan<byte> s
8686
fixed (byte* destPtr = dest)
8787
fixed (byte* sourcePtr = source)
8888
{
89-
var destLen = (nint)dest.Length;
90-
var sourceLen = (nint)source.Length;
91-
var result = CompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
89+
IntPtr destLen = (nint)dest.Length;
90+
IntPtr sourceLen = (nint)source.Length;
91+
ZlibngCompressionResult result = CompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
9292
bytesWritten = T.CreateChecked(destLen);
9393
return result;
9494
}

‎src/Zlib-ng.NET/Zlibng.Compress2.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public int Compress2(Span<byte> dest, ReadOnlySpan<byte> source, ZlibngCompressi
4747
fixed (byte* destPtr = dest)
4848
fixed (byte* sourcePtr = source)
4949
{
50-
var destLen = (nint)dest.Length;
51-
var sourceLen = (nint)source.Length;
52-
var result = Compress2FunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen, level);
50+
IntPtr destLen = (nint)dest.Length;
51+
IntPtr sourceLen = (nint)source.Length;
52+
ZlibngCompressionResult result = Compress2FunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen, level);
5353
return Util.GetReturnValue(result, destLen);
5454
}
5555
}
@@ -86,9 +86,9 @@ public ZlibngCompressionResult Compress2<T>(Span<byte> dest, ReadOnlySpan<byte>
8686
fixed (byte* destPtr = dest)
8787
fixed (byte* sourcePtr = source)
8888
{
89-
var destLen = (nint)dest.Length;
90-
var sourceLen = (nint)source.Length;
91-
var result = Compress2FunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen, level);
89+
IntPtr destLen = (nint)dest.Length;
90+
IntPtr sourceLen = (nint)source.Length;
91+
ZlibngCompressionResult result = Compress2FunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen, level);
9292
bytesWritten = T.CreateChecked(destLen);
9393
return result;
9494
}

‎src/Zlib-ng.NET/Zlibng.Uncompress.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public int Uncompress(Span<byte> dest, ReadOnlySpan<byte> source)
5050
fixed (byte* destPtr = dest)
5151
fixed (byte* sourcePtr = source)
5252
{
53-
var destLen = (nint)dest.Length;
54-
var sourceLen = (nint)source.Length;
55-
var result = UncompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
53+
IntPtr destLen = (nint)dest.Length;
54+
IntPtr sourceLen = (nint)source.Length;
55+
ZlibngCompressionResult result = UncompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
5656
return Util.GetReturnValue(result, destLen);
5757
}
5858
}
@@ -89,9 +89,9 @@ public ZlibngCompressionResult Uncompress<T>(Span<byte> dest, ReadOnlySpan<byte>
8989
fixed (byte* destPtr = dest)
9090
fixed (byte* sourcePtr = source)
9191
{
92-
var destLen = (nint)dest.Length;
93-
var sourceLen = (nint)source.Length;
94-
var result = UncompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
92+
IntPtr destLen = (nint)dest.Length;
93+
IntPtr sourceLen = (nint)source.Length;
94+
ZlibngCompressionResult result = UncompressFunctionPointer(destPtr, ref destLen, sourcePtr, sourceLen);
9595
bytesWritten = T.CreateChecked(destLen);
9696
return result;
9797
}

‎src/Zlib-ng.NET/Zlibng.Uncompress2.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public ZlibngCompressionResult Uncompress2<T1, T2>(Span<byte> dest, ReadOnlySpan
4343
fixed (byte* destPtr = dest)
4444
fixed (byte* sourcePtr = source)
4545
{
46-
var destLen = (nint)dest.Length;
47-
var sourceLen = (nint)source.Length;
48-
var result = Uncompress2FunctionPointer(destPtr, ref destLen, sourcePtr, ref sourceLen);
46+
IntPtr destLen = (nint)dest.Length;
47+
IntPtr sourceLen = (nint)source.Length;
48+
ZlibngCompressionResult result = Uncompress2FunctionPointer(destPtr, ref destLen, sourcePtr, ref sourceLen);
4949
bytesWritten = T1.CreateChecked(destLen);
5050
bytesConsumed = T2.CreateChecked(sourceLen);
5151
return result;

‎src/Zlib-ng.NET/Zlibng.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public Zlibng(nint handle)
3131
Util.ThrowIfNull(handle);
3232
Handle = handle;
3333

34-
var compressBoundAddress = NativeLibrary.GetExport(Handle, "zng_compressBound");
35-
var uncompressAddress = NativeLibrary.GetExport(Handle, "zng_uncompress");
36-
var uncompress2Address = NativeLibrary.GetExport(Handle, "zng_uncompress2");
37-
var compressAddress = NativeLibrary.GetExport(Handle, "zng_compress");
38-
var compress2Address = NativeLibrary.GetExport(Handle, "zng_compress2");
39-
var versionAddress = NativeLibrary.GetExport(Handle, "zlibng_version");
34+
IntPtr compressBoundAddress = NativeLibrary.GetExport(Handle, "zng_compressBound");
35+
IntPtr uncompressAddress = NativeLibrary.GetExport(Handle, "zng_uncompress");
36+
IntPtr uncompress2Address = NativeLibrary.GetExport(Handle, "zng_uncompress2");
37+
IntPtr compressAddress = NativeLibrary.GetExport(Handle, "zng_compress");
38+
IntPtr compress2Address = NativeLibrary.GetExport(Handle, "zng_compress2");
39+
IntPtr versionAddress = NativeLibrary.GetExport(Handle, "zlibng_version");
4040

4141
CompressBoundFunctionPointer = (delegate* unmanaged<nint, nint>)compressBoundAddress;
4242
UncompressFunctionPointer = (delegate* unmanaged<void*, ref nint, void*, nint, ZlibngCompressionResult>)uncompressAddress;

0 commit comments

Comments
 (0)