ignore mouse wheel events which are coming too fast to be processed (#9057)

[wxWidgets.git] / src / common / ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 3672b76b4bc5072f33324cfbc98353bc6fef4700..27b3e70cdf3af1bd18a02b4d5065f03205cd28f1 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -38,6 +38,7 @@
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/wxcrtvararg.h"

 #endif // WX_PRECOMP
 
 #include "wx/sckaddr.h"
 #endif // WX_PRECOMP
 
 #include "wx/sckaddr.h"


@@ -47,10 +48,6 @@
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"
 
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"
 

-#if defined(__WXMAC__)
-    #include "wx/mac/macsock.h"
-#endif
-

 #ifndef __MWERKS__
     #include <memory.h>
 #endif
 #ifndef __MWERKS__
     #include <memory.h>
 #endif


@@ -313,7 +310,7 @@ char wxFTP::GetResult()
             }
             else // subsequent line of multiline reply
             {
             }
             else // subsequent line of multiline reply
             {

-                if ( wxStrncmp(line, code, LEN_CODE) == 0 )
+                if ( line.compare(0, LEN_CODE, code) == 0 )

                 {
                     if ( chMarker == _T(' ') )
                     {
                 {
                     if ( chMarker == _T(' ') )
                     {


@@ -377,7 +374,7 @@ bool wxFTP::SetTransferMode(TransferMode transferMode)
 
     if ( !DoSimpleCommand(_T("TYPE"), mode) )
     {
 
     if ( !DoSimpleCommand(_T("TYPE"), mode) )
     {

-        wxLogError(_("Failed to set FTP transfer mode to %s."), (const wxChar*)
+        wxLogError(_("Failed to set FTP transfer mode to %s."),

                    (transferMode == ASCII ? _("ASCII") : _("binary")));
 
         return false;
                    (transferMode == ASCII ? _("ASCII") : _("binary")));
 
         return false;


@@ -686,7 +683,7 @@ wxSocketBase *wxFTP::GetActivePort()
     // addresses because the addrNew has an IP of "0.0.0.0", so we need the
     // value in addrLocal
     wxString port = GetPortCmdArgument(addrLocal, addrNew);
     // addresses because the addrNew has an IP of "0.0.0.0", so we need the
     // value in addrLocal
     wxString port = GetPortCmdArgument(addrLocal, addrNew);

-    if ( !DoSimpleCommand(_T("PORT "), port) )
+    if ( !DoSimpleCommand(_T("PORT"), port) )

     {
         m_lastError = wxPROTO_PROTERR;
         delete sockSrv;
     {
         m_lastError = wxPROTO_PROTERR;
         delete sockSrv;


@@ -706,18 +703,20 @@ wxSocketBase *wxFTP::GetPassivePort()
         return NULL;
     }
 
         return NULL;
     }
 

-    const wxChar *addrStart = wxStrchr(m_lastResult, _T('('));
-    const wxChar *addrEnd = addrStart ? wxStrchr(addrStart, _T(')')) : NULL;
-    if ( !addrEnd )
+    size_t addrStart = m_lastResult.find(_T('('));
+    size_t addrEnd = (addrStart == wxString::npos)
+                     ? wxString::npos
+                     : m_lastResult.find(_T(')'), addrStart);
+
+    if ( addrEnd == wxString::npos )

     {
         m_lastError = wxPROTO_PROTERR;
     {
         m_lastError = wxPROTO_PROTERR;

-

         return NULL;
     }
 
     // get the port number and address
     int a[6];
         return NULL;
     }
 
     // get the port number and address
     int a[6];

-    wxString straddr(addrStart + 1, addrEnd);
+    wxString straddr(m_lastResult, addrStart + 1, addrEnd - (addrStart + 1));

     wxSscanf(straddr, wxT("%d,%d,%d,%d,%d,%d"),
              &a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
 
     wxSscanf(straddr, wxT("%d,%d,%d,%d,%d,%d"),
              &a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);