Inlining out parameters declaration

Source commit: a3965de2b036daabe4470573db59e7f6b1aebd84

dotnet/ChmodEventArgs.cs

@@ -23,8 +23,7 @@ namespace WinSCP
             {
                 while (reader.Read(0))
                 {
-                    string value;
-                    if (reader.GetEmptyElementValue("filename", out value))
+                    if (reader.GetEmptyElementValue("filename", out string value))
                     {
                         args.FileName = value;
                     }

dotnet/RemovalEventArgs.cs

@@ -21,8 +21,7 @@ namespace WinSCP
             {
                 while (reader.Read(0))
                 {
-                    string value;
-                    if (reader.GetEmptyElementValue("filename", out value))
+                    if (reader.GetEmptyElementValue("filename", out string value))
                     {
                         args.FileName = value;
                     }

dotnet/Session.cs

@@ -222,9 +222,7 @@ namespace WinSCP
                         string.Format(CultureInfo.InvariantCulture, "option reconnecttime {0}", reconnectTimeValue);
                     WriteCommand(reconnectTimeCommand);
 
-                    string command;
-                    string log;
-                    SessionOptionsToUrlAndSwitches(sessionOptions, false, out command, out log);
+                    SessionOptionsToUrlAndSwitches(sessionOptions, false, out string command, out string log);
                     const string openCommand = "open ";
                     command = openCommand + command;
                     log = openCommand + log;
@@ -300,8 +298,7 @@ namespace WinSCP
                     {
                         while (cwdReader.Read(0))
                         {
-                            string value;
-                            if (cwdReader.GetEmptyElementValue("cwd", out value))
+                            if (cwdReader.GetEmptyElementValue("cwd", out string value))
                             {
                                 _homePath = value;
                             }
@@ -356,9 +353,7 @@ namespace WinSCP
                 {
                     ResetOutput();
 
-                    string command;
-                    string log; // unused
-                    SessionOptionsToUrlAndSwitches(sessionOptions, true, out command, out log);
+                    SessionOptionsToUrlAndSwitches(sessionOptions, true, out string command, out string log);
 
                     string additionalArguments = "/fingerprintscan " + command;
 
@@ -443,8 +438,7 @@ namespace WinSCP
                                 {
                                     while (fileReader.Read(0))
                                     {
-                                        string value;
-                                        if (fileReader.GetEmptyElementValue("filename", out value))
+                                        if (fileReader.GetEmptyElementValue("filename", out string value))
                                         {
                                             fileInfo.Name = value;
                                             fileInfo.FullName = destination + value;
@@ -914,8 +908,7 @@ namespace WinSCP
                 {
                     while (callReader.Read(0))
                     {
-                        string value;
-                        if (callReader.GetEmptyElementValue("output", out value))
+                        if (callReader.GetEmptyElementValue("output", out string value))
                         {
                             result.Output = value;
                         }
@@ -983,8 +976,7 @@ namespace WinSCP
                 {
                     while (checksumReader.Read(0))
                     {
-                        string value;
-                        if (checksumReader.GetEmptyElementValue("checksum", out value))
+                        if (checksumReader.GetEmptyElementValue("checksum", out string value))
                         {
                             hex = value;
                         }
@@ -1263,8 +1255,7 @@ namespace WinSCP
         {
             using (Logger.CreateCallstack())
             {
-                string value;
-                if (fileReader.GetEmptyElementValue("type", out value))
+                if (fileReader.GetEmptyElementValue("type", out string value))
                 {
                     fileInfo.FileType = value[0];
                 }
@@ -1518,9 +1509,7 @@ namespace WinSCP
                 url += tail;
                 logUrl += tail;
 
-                string arguments;
-                string logArguments;
-                SessionOptionsToSwitches(sessionOptions, scanFingerprint, out arguments, out logArguments);
+                SessionOptionsToSwitches(sessionOptions, scanFingerprint, out string arguments, out string logArguments);
 
                 const string switchName = "-rawsettings";
                 Tools.AddRawParameters(ref arguments, sessionOptions.RawSettings, "-rawsettings");
@@ -1676,8 +1665,7 @@ namespace WinSCP
                 {
                     while (statReader.Read(0))
                     {
-                        string value;
-                        if (statReader.GetEmptyElementValue("filename", out value))
+                        if (statReader.GetEmptyElementValue("filename", out string value))
                         {
                             string name = value;
                             int p = name.LastIndexOf('/');

dotnet/SessionOptions.cs

@@ -180,8 +180,7 @@ namespace WinSCP
             else
             {
                 portNumber = UriUnescape(portNumber);
-                int number;
-                if (!int.TryParse(portNumber, 0, CultureInfo.InvariantCulture, out number))
+                if (!int.TryParse(portNumber, 0, CultureInfo.InvariantCulture, out int number))
                 {
                     throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "{0} is not a valid port number", portNumber), "url");
                 }

dotnet/TouchEventArgs.cs

@@ -25,8 +25,7 @@ namespace WinSCP
             {
                 while (reader.Read(0))
                 {
-                    string value;
-                    if (reader.GetEmptyElementValue("filename", out value))
+                    if (reader.GetEmptyElementValue("filename", out string value))
                     {
                         args.FileName = value;
                     }

dotnet/TransferEventArgs.cs

@@ -31,8 +31,7 @@ namespace WinSCP
             {
                 while (reader.Read(0))
                 {
-                    string value;
-                    if (reader.GetEmptyElementValue("filename", out value))
+                    if (reader.GetEmptyElementValue("filename", out string value))
                     {
                         args.FileName = value;
                     }

dotnet/internal/ExeSessionProcess.cs

@@ -596,12 +596,11 @@ namespace WinSCP
 
         private bool TryCreateEvent(string name, out EventWaitHandle ev)
         {
-            bool createdNew;
             _logger.WriteLine("Creating event {0}", name);
 
             EventWaitHandleSecurity security = CreateSecurity(EventWaitHandleRights.FullControl);
 
-            ev = new EventWaitHandle(false, EventResetMode.AutoReset, name, out createdNew, security);
+            ev = new EventWaitHandle(false, EventResetMode.AutoReset, name, out bool createdNew, security);
             _logger.WriteLine(
                 "Created event {0} with handle {1} with security {2}, new {3}",
                 name, ev.SafeWaitHandle.DangerousGetHandle(),
@@ -638,8 +637,7 @@ namespace WinSCP
 
         private EventWaitHandle CreateEvent(string name)
         {
-            EventWaitHandle ev;
-            if (!TryCreateEvent(name, out ev))
+            if (!TryCreateEvent(name, out EventWaitHandle ev))
             {
                 throw _logger.WriteException(new SessionLocalException(_session, string.Format(CultureInfo.InvariantCulture, "Event {0} already exists", name)));
             }
@@ -651,8 +649,7 @@ namespace WinSCP
             if (_session.TestHandlesClosedInternal)
             {
                 _logger.WriteLine("Testing that event {0} is closed", name);
-                EventWaitHandle ev;
-                if (TryCreateEvent(name, out ev))
+                if (TryCreateEvent(name, out EventWaitHandle ev))
                 {
                     ev.Close();
                 }
@@ -856,12 +853,11 @@ namespace WinSCP
                 result = null;
 
                 IntPtr data = IntPtr.Zero;
-                RegistryType type;
                 uint len = 0;
                 RegistryFlags flags = RegistryFlags.RegSz | RegistryFlags.SubKeyWow6432Key;
                 UIntPtr key = (UIntPtr)((uint)hive);
 
-                if (UnsafeNativeMethods.RegGetValue(key, uninstallKey, appPathValue, flags, out type, data, ref len) == 0)
+                if (UnsafeNativeMethods.RegGetValue(key, uninstallKey, appPathValue, flags, out RegistryType type, data, ref len) == 0)
                 {
                     data = Marshal.AllocHGlobal((int)len);
                     if (UnsafeNativeMethods.RegGetValue(key, uninstallKey, appPathValue, flags, out type, data, ref len) == 0)

dotnet/internal/Logger.cs

@@ -134,8 +134,7 @@ namespace WinSCP
             lock (_logLock)
             {
                 int threadId = GetThread();
-                int indent;
-                if (!_indents.TryGetValue(threadId, out indent))
+                if (!_indents.TryGetValue(threadId, out int indent))
                 {
                     indent = 0;
                 }
@@ -265,8 +264,7 @@ namespace WinSCP
 
         private int GetIndent()
         {
-            int indent;
-            if (!_indents.TryGetValue(GetThread(), out indent))
+            if (!_indents.TryGetValue(GetThread(), out int indent))
             {
                 indent = 0;
             }