From 567f8b7e4a5374a710a58b4b044cedd4c645639f Mon Sep 17 00:00:00 2001 From: icedream Date: Thu, 11 Dec 2014 02:26:08 +0100 Subject: [PATCH] Source code cleanup. --- .nuget/NuGet.Config | 1 + GarrysMod.AddonCreator.sln.DotSettings | 2 ++ src/addoncreator/Addon/AddonFile.cs | 4 ---- .../Addon/SegmentedAddonFileInfo.cs | 7 ++----- .../GarrysMod.AddonCreator.csproj | 5 ----- src/addoncreator/Hashing/OptimizedCRC.cs | 10 +++++----- src/addoncreator/Hashing/ParallelCRC.cs | 20 +++++++++---------- src/addoncreator/Hashing/TraditionalCRC.cs | 4 ++-- src/addoncreator/Program.cs | 5 +++-- 9 files changed, 25 insertions(+), 33 deletions(-) create mode 100644 GarrysMod.AddonCreator.sln.DotSettings diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config index 67f8ea0..3343d68 100644 --- a/.nuget/NuGet.Config +++ b/.nuget/NuGet.Config @@ -1,4 +1,5 @@  + diff --git a/GarrysMod.AddonCreator.sln.DotSettings b/GarrysMod.AddonCreator.sln.DotSettings new file mode 100644 index 0000000..d18f71a --- /dev/null +++ b/GarrysMod.AddonCreator.sln.DotSettings @@ -0,0 +1,2 @@ + + ID \ No newline at end of file diff --git a/src/addoncreator/Addon/AddonFile.cs b/src/addoncreator/Addon/AddonFile.cs index 17cb94e..2b63077 100644 --- a/src/addoncreator/Addon/AddonFile.cs +++ b/src/addoncreator/Addon/AddonFile.cs @@ -67,10 +67,6 @@ namespace GarrysMod.AddonCreator.Addon /// public List RequiredContent { get; private set; } - public static void CreateFromFolder() - { - } - /// /// Imports a gmod addon into this instance. /// diff --git a/src/addoncreator/Addon/SegmentedAddonFileInfo.cs b/src/addoncreator/Addon/SegmentedAddonFileInfo.cs index d4d66d0..c1e473c 100644 --- a/src/addoncreator/Addon/SegmentedAddonFileInfo.cs +++ b/src/addoncreator/Addon/SegmentedAddonFileInfo.cs @@ -5,10 +5,10 @@ namespace GarrysMod.AddonCreator.Addon { public class SegmentedAddonFileInfo : AddonFileInfo { + private readonly int _hash; private readonly long _len; private readonly long _pos; private readonly Stream _stream; - private int _hash; public SegmentedAddonFileInfo(Stream stream, long pos, long len, int fileHash) { @@ -20,10 +20,7 @@ namespace GarrysMod.AddonCreator.Addon public override long Size { - get - { - return _len; - } + get { return _len; } } public override int Crc32Hash diff --git a/src/addoncreator/GarrysMod.AddonCreator.csproj b/src/addoncreator/GarrysMod.AddonCreator.csproj index 0cc1f45..fd52c11 100644 --- a/src/addoncreator/GarrysMod.AddonCreator.csproj +++ b/src/addoncreator/GarrysMod.AddonCreator.csproj @@ -47,11 +47,6 @@ - - - - - diff --git a/src/addoncreator/Hashing/OptimizedCRC.cs b/src/addoncreator/Hashing/OptimizedCRC.cs index d511ae3..aff0975 100644 --- a/src/addoncreator/Hashing/OptimizedCRC.cs +++ b/src/addoncreator/Hashing/OptimizedCRC.cs @@ -19,14 +19,14 @@ namespace GarrysMod.AddonCreator.Hashing uint i; for (i = 0; i < 256; i++) { - uint r = i; - for (int j = 0; j < 8; j++) + var r = i; + for (var j = 0; j < 8; j++) r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1)); Table[i] = r; } for (; i < 256*CRC_NUM_TABLES; i++) { - uint r = Table[i - 256]; + var r = Table[i - 256]; Table[i] = Table[r & 0xFF] ^ (r >> 8); } } @@ -62,7 +62,7 @@ namespace GarrysMod.AddonCreator.Hashing var table = Table; // important for performance! - uint crc = value; + var crc = value; for (; (offset & 7) != 0 && count != 0; count--) crc = (crc >> 8) ^ table[(byte) crc ^ data[offset++]]; @@ -73,7 +73,7 @@ namespace GarrysMod.AddonCreator.Hashing * Idea from 7-zip project sources (http://7-zip.org/sdk.html) */ - int to = (count - 8) & ~7; + var to = (count - 8) & ~7; count -= to; to += offset; diff --git a/src/addoncreator/Hashing/ParallelCRC.cs b/src/addoncreator/Hashing/ParallelCRC.cs index 1d438b9..444398d 100644 --- a/src/addoncreator/Hashing/ParallelCRC.cs +++ b/src/addoncreator/Hashing/ParallelCRC.cs @@ -25,13 +25,13 @@ namespace GarrysMod.AddonCreator.Hashing for (i = 0; i < 256; i++) { var r = (uint) i; - for (int j = 0; j < 8; j++) + for (var j = 0; j < 8; j++) r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1)); Table[i] = r; } for (; i < 256*CRC_NUM_TABLES; i++) { - uint r = Table[i - 256]; + var r = Table[i - 256]; Table[i] = Table[r & 0xFF] ^ (r >> 8); } } @@ -72,9 +72,9 @@ namespace GarrysMod.AddonCreator.Hashing // choose optimal number of threads to use - int threadCount = ThreadCount; + var threadCount = ThreadCount; L0: - int bytesPerThread = (count + threadCount - 1)/threadCount; + var bytesPerThread = (count + threadCount - 1)/threadCount; if (bytesPerThread < ThreadCost >> 1) { threadCount--; @@ -115,7 +115,7 @@ namespace GarrysMod.AddonCreator.Hashing if (count >= 8) { - int to = (count - 8) & ~7; + var to = (count - 8) & ~7; count -= to; to += offset; @@ -188,8 +188,8 @@ namespace GarrysMod.AddonCreator.Hashing Prepare_even_odd_Cache(); } - uint[] even = CopyArray(even_cache); - uint[] odd = CopyArray(odd_cache); + var even = CopyArray(even_cache); + var odd = CopyArray(odd_cache); crc1 = ~crc1; crc2 = ~crc2; @@ -225,7 +225,7 @@ namespace GarrysMod.AddonCreator.Hashing // put operator for one zero bit in odd odd[0] = kCrcPoly; // the CRC-32 polynomial - for (int i = 1; i < 32; i++) odd[i] = 1U << (i - 1); + for (var i = 1; i < 32; i++) odd[i] = 1U << (i - 1); // put operator for two zero bits in even gf2_matrix_square(even, odd); @@ -241,7 +241,7 @@ namespace GarrysMod.AddonCreator.Hashing private static uint gf2_matrix_times(uint[] matrix, uint vec) { uint sum = 0; - int i = 0; + var i = 0; while (vec != 0) { if ((vec & 1) != 0) sum ^= matrix[i]; @@ -255,7 +255,7 @@ namespace GarrysMod.AddonCreator.Hashing /// will not be modified private static void gf2_matrix_square(uint[] square, uint[] mat) { - for (int i = 0; i < 32; i++) + for (var i = 0; i < 32; i++) square[i] = gf2_matrix_times(mat, mat[i]); } diff --git a/src/addoncreator/Hashing/TraditionalCRC.cs b/src/addoncreator/Hashing/TraditionalCRC.cs index 65ccdec..77b7d37 100644 --- a/src/addoncreator/Hashing/TraditionalCRC.cs +++ b/src/addoncreator/Hashing/TraditionalCRC.cs @@ -17,8 +17,8 @@ namespace GarrysMod.AddonCreator.Hashing Table = new uint[256]; for (uint i = 0; i < 256; i++) { - uint r = i; - for (int j = 0; j < 8; j++) + var r = i; + for (var j = 0; j < 8; j++) r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1)); Table[i] = r; } diff --git a/src/addoncreator/Program.cs b/src/addoncreator/Program.cs index 5a9c7f8..7a1f67c 100644 --- a/src/addoncreator/Program.cs +++ b/src/addoncreator/Program.cs @@ -25,7 +25,8 @@ namespace GarrysMod.AddonCreator if (!folder.Exists) { - Console.Error.WriteLine("ERROR: Input folder needs to exist and needs to contain appropriate data."); + Console.Error.WriteLine( + "ERROR: Input folder needs to exist and needs to contain appropriate data."); return; } @@ -67,7 +68,7 @@ namespace GarrysMod.AddonCreator { addon.Import(gma); } - catch(Exception err) + catch (Exception err) { Console.Error.WriteLine("ERROR: Input GMA file could not be read - {0}", err.Message); #if DEBUG