X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2454588723f7877c32d721fb190a64c66ec2fa4..0bba37f51ded370ee79e26916c4c94ce5dc1f44e:/src/common/ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 474a98a6dc..013495c741 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -348,7 +348,7 @@ char wxFTP::GetResult()
     }
 
     // if we got here we must have a non empty code string
-    return code[0u];
+    return (char)code[0u];
 }
 
 // ----------------------------------------------------------------------------
@@ -728,7 +728,7 @@ wxSocketBase *wxFTP::GetPassivePort()
                         (wxUint16)a[3] << 16 |
                         (wxUint16)a[4] << 8 |
                         a[5];
-    wxUint16 port = (wxUint16)a[0] << 8 | a[1];
+    wxUint16 port = (wxUint16)(a[0] << 8 | a[1]);
 
     wxIPV4address addr;
     addr.Hostname(hostaddr);
@@ -771,7 +771,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
         return NULL;
     }
 
-    wxString tmp_str = wxT("RETR ") + wxURL::ConvertFromURI(path);
+    wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
     if ( !CheckCommand(tmp_str, '1') )
         return NULL;
 
@@ -824,7 +824,7 @@ bool wxFTP::GetList(wxArrayString& files,
     //        - Windows : like "dir" command
     //        - others  : ?
     wxString line(details ? _T("LIST") : _T("NLST"));
-    if ( !wildcard.IsEmpty() )
+    if ( !wildcard.empty() )
     {
         line << _T(' ') << wildcard;
     }
@@ -832,7 +832,7 @@ bool wxFTP::GetList(wxArrayString& files,
     if ( !CheckCommand(line, '1') )
     {
         m_lastError = wxPROTO_PROTERR;
-        wxLogDebug("FTP 'LIST' command returned unexpected result from server");
+        wxLogDebug(_T("FTP 'LIST' command returned unexpected result from server"));
         delete sock;
         return false;
     }