diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs index b40a097a2..8a39b7aea 100644 --- a/Dalamud/Utility/Util.cs +++ b/Dalamud/Utility/Util.cs @@ -216,7 +216,7 @@ namespace Dalamud.Utility } /// - /// Compress a string using GZip. + /// Compress a string using GZip. /// /// The input string. /// The compressed output bytes. @@ -224,35 +224,29 @@ namespace Dalamud.Utility { var bytes = Encoding.UTF8.GetBytes(str); - using (var msi = new MemoryStream(bytes)) - using (var mso = new MemoryStream()) - { - using (var gs = new GZipStream(mso, CompressionMode.Compress)) - { - CopyTo(msi, gs); - } + using var msi = new MemoryStream(bytes); + using var mso = new MemoryStream(); + using var gs = new GZipStream(mso, CompressionMode.Compress); - return mso.ToArray(); - } + CopyTo(msi, gs); + + return mso.ToArray(); } /// - /// Decompress a string using GZip. + /// Decompress a string using GZip. /// /// The input bytes. /// The compressed output string. public static string DecompressString(byte[] bytes) { - using (var msi = new MemoryStream(bytes)) - using (var mso = new MemoryStream()) - { - using (var gs = new GZipStream(msi, CompressionMode.Decompress)) - { - CopyTo(gs, mso); - } + using var msi = new MemoryStream(bytes); + using var mso = new MemoryStream(); + using var gs = new GZipStream(msi, CompressionMode.Decompress); - return Encoding.UTF8.GetString(mso.ToArray()); - } + CopyTo(gs, mso); + + return Encoding.UTF8.GetString(mso.ToArray()); } /// @@ -269,9 +263,6 @@ namespace Dalamud.Utility while ((cnt = src.Read(bytes, 0, bytes.Length)) != 0) dest.Write(bytes, 0, cnt); } - // TODO: Someone implement GetUTF8String with some IntPtr overloads. - // while(Marshal.ReadByte(0, sz) != 0) { sz++; } - /// /// Heuristically determine if Dalamud is running on Linux/WINE. ///