Avoiding two variables with the same name

(cherry picked from commit 50a8200c664d1812684e14eed1e97fd767df3ea0)

# Conflicts:
#	source/core/SessionData.cpp

Source commit: b110dc2eef9cd36670e967d4dc718ac8daf1b575

source/core/SessionData.cpp

@@ -1920,20 +1920,20 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   bool ProtocolDefined = false;
   bool PortNumberDefined = false;
   TFSProtocol AFSProtocol;
-  int APortNumber;
+  int DefaultProtocolPortNumber;
   TFtps AFtps = ftpsNone;
   int ProtocolLen = 0;
   if (IsProtocolUrl(Url, ScpProtocol, ProtocolLen))
   {
     AFSProtocol = fsSCPonly;
-    APortNumber = SshPortNumber;
+    DefaultProtocolPortNumber = SshPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
   else if (IsProtocolUrl(Url, SftpProtocol, ProtocolLen))
   {
     AFSProtocol = fsSFTPonly;
-    APortNumber = SshPortNumber;
+    DefaultProtocolPortNumber = SshPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1941,7 +1941,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   {
     AFSProtocol = fsFTP;
     Ftps = ftpsNone;
-    APortNumber = FtpPortNumber;
+    DefaultProtocolPortNumber = FtpPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1949,7 +1949,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   {
     AFSProtocol = fsFTP;
     AFtps = ftpsImplicit;
-    APortNumber = FtpsImplicitPortNumber;
+    DefaultProtocolPortNumber = FtpsImplicitPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1957,7 +1957,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   {
     AFSProtocol = fsFTP;
     AFtps = ftpsExplicitTls;
-    APortNumber = FtpPortNumber;
+    DefaultProtocolPortNumber = FtpPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1966,7 +1966,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   {
     AFSProtocol = fsWebDAV;
     AFtps = ftpsNone;
-    APortNumber = HTTPPortNumber;
+    DefaultProtocolPortNumber = HTTPPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1975,7 +1975,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   {
     AFSProtocol = fsWebDAV;
     AFtps = ftpsImplicit;
-    APortNumber = HTTPSPortNumber;
+    DefaultProtocolPortNumber = HTTPSPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1983,7 +1983,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
   {
     AFSProtocol = fsS3;
     AFtps = ftpsImplicit;
-    APortNumber = HTTPSPortNumber;
+    DefaultProtocolPortNumber = HTTPSPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -1993,7 +1993,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
     // The only place where a difference is made is GetLoginData() in WinMain.cpp
     AFSProtocol = fsSFTPonly;
     PuttyProtocol = PuttySshProtocol;
-    APortNumber = SshPortNumber;
+    DefaultProtocolPortNumber = SshPortNumber;
     MoveStr(Url, MaskedUrl, ProtocolLen);
     ProtocolDefined = true;
   }
@@ -2143,7 +2143,7 @@ bool __fastcall TSessionData::ParseUrl(UnicodeString Url, TOptions * Options,
         {
           AFSProtocol = fsS3;
         }
-        PortNumber = APortNumber;
+        PortNumber = DefaultProtocolPortNumber;
       }
 
       if (ProtocolDefined)