Просмотр исходного кода

Bringing declarations closer to use

Source commit: 135ec4eac8cfaa37295c4146f2815d84bd9ecbcc
Martin Prikryl 4 лет назад
Родитель
Сommit
cf878847b7
1 измененных файлов с 10 добавлено и 13 удалено
  1. 10 13
      source/windows/TerminalManager.cpp

+ 10 - 13
source/windows/TerminalManager.cpp

@@ -1887,19 +1887,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)
@@ -1926,8 +1915,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
     {