From d67b94c76becadc44d8614fe5338725748bdaf15 Mon Sep 17 00:00:00 2001
From: Syrone Wong <wong.syrone@gmail.com>
Date: Sat, 13 Aug 2016 18:12:11 +0800
Subject: [PATCH] Minor changes

- Revert UncompressFile() changes
- Simplify code

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
---
 shadowsocks-csharp/Controller/FileManager.cs | 29 ++++++++------------
 shadowsocks-csharp/Util/Util.cs              | 13 +++------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/shadowsocks-csharp/Controller/FileManager.cs b/shadowsocks-csharp/Controller/FileManager.cs
index 1c761c88..f15a1cc1 100755
--- a/shadowsocks-csharp/Controller/FileManager.cs
+++ b/shadowsocks-csharp/Controller/FileManager.cs
@@ -24,25 +24,20 @@ namespace Shadowsocks.Controller
 
         public static void UncompressFile(string fileName, byte[] content)
         {
-            try {
-                // Because the uncompressed size of the file is unknown,
-                // we are using an arbitrary buffer size.
-                byte[] buffer = new byte[4096];
-                int n;
+            // Because the uncompressed size of the file is unknown,
+            // we are using an arbitrary buffer size.
+            byte[] buffer = new byte[4096];
+            int n;
 
-                using(var fs = File.Create(fileName))
-                using (var input = new GZipStream(new MemoryStream(content),
-                        CompressionMode.Decompress, false))
-                    {
-                        while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
-                        {
-                            fs.Write(buffer, 0, n);
-                        }
-                    }
-            } catch ( Exception e ) {
-                Logging.LogUsefulException( e );
+            using(var fs = File.Create(fileName))
+            using (var input = new GZipStream(new MemoryStream(content),
+                    CompressionMode.Decompress, false))
+            {
+                while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    fs.Write(buffer, 0, n);
+                }
             }
         }
-
     }
 }
diff --git a/shadowsocks-csharp/Util/Util.cs b/shadowsocks-csharp/Util/Util.cs
index 8a3fcc91..53077c87 100755
--- a/shadowsocks-csharp/Util/Util.cs
+++ b/shadowsocks-csharp/Util/Util.cs
@@ -151,15 +151,10 @@ namespace Shadowsocks.Util
             // we are building x86 binary for both x86 and x64, which will
             // cause problem when opening registry key
             // detect operating system instead of CPU
-            if ( Environment.Is64BitOperatingSystem ) {
-                RegistryKey userKey = RegistryKey.OpenBaseKey( RegistryHive.CurrentUser, RegistryView.Registry64 );
-                userKey = userKey.OpenSubKey( name, writable );
-                return userKey;
-            } else {
-                RegistryKey userKey = RegistryKey.OpenBaseKey( RegistryHive.CurrentUser, RegistryView.Registry32 );
-                userKey = userKey.OpenSubKey( name, writable );
-                return userKey;
-            }
+            RegistryKey userKey = RegistryKey.OpenBaseKey( RegistryHive.CurrentUser,
+                Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32 );
+            userKey = userKey.OpenSubKey( name, writable );
+            return userKey;
         }
 
         [DllImport("kernel32.dll")]