1
0
Эх сурвалжийг харах

Bringing declarations closer to use

(cherry picked from commit cf878847b7edb77450535bc02a59bf5204ae5a5d)

Source commit: 953c70089108d235179b4b9048000b4d3bd6b7d6
Martin Prikryl 4 жил өмнө
parent
commit
1eb294fc4e

+ 10 - 13
source/windows/TerminalManager.cpp

@@ -1808,19 +1808,8 @@ bool __fastcall TTerminalManager::UploadPublicKey(
     Configuration->Usage->Inc(L"PublicKeyInstallation");
     FileName = OpenDialog->FileName;
 
-    bool AutoReadDirectory;
-    bool ExceptionOnFail;
-    UnicodeString TemporaryDir;
-
-    const UnicodeString SshFolder = L".ssh";
-    const UnicodeString AuthorizedKeysFile = L"authorized_keys";
-    UnicodeString AuthorizedKeysFilePath = FORMAT(L"%s/%s", (SshFolder, AuthorizedKeysFile));
-
     VerifyAndConvertKey(FileName, false);
 
-    UnicodeString Comment;
-    UnicodeString Line = GetPublicKeyLine(FileName, Comment);
-
     bool AdHocTerminal = (Terminal == NULL);
     std::unique_ptr<TTerminal> TerminalOwner;
     if (AdHocTerminal)
@@ -1847,8 +1836,16 @@ bool __fastcall TTerminalManager::UploadPublicKey(
     bool Installed = false;
     bool WrongRights = false;
 
-    AutoReadDirectory = Terminal->AutoReadDirectory;
-    ExceptionOnFail = Terminal->ExceptionOnFail;
+    UnicodeString TemporaryDir;
+    bool AutoReadDirectory = Terminal->AutoReadDirectory;
+    bool ExceptionOnFail = Terminal->ExceptionOnFail;
+
+    const UnicodeString SshFolder = L".ssh";
+    const UnicodeString AuthorizedKeysFile = L"authorized_keys";
+    UnicodeString AuthorizedKeysFilePath = FORMAT(L"%s/%s", (SshFolder, AuthorizedKeysFile));
+
+    UnicodeString Comment;
+    UnicodeString Line = GetPublicKeyLine(FileName, Comment);
 
     try
     {