make string at least empty (instead of containing garbage) if malloc() failed

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index f3126b2f333b5120b7b3056e51665c62a594de8c..baac336f08fa1b03643e4847f20bcad77978a788 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -10,7 +10,7 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -507,7 +507,7 @@ public:
     {
         delete m_i_socket;
 
     {
         delete m_i_socket;
 

-        if ( LastError() == wxStream_NOERROR )
+        if ( IsOk() )

         {
             // wait for "226 transfer completed"
             m_ftp->CheckResult('2');
         {
             // wait for "226 transfer completed"
             m_ftp->CheckResult('2');


@@ -524,6 +524,8 @@ public:
 
     wxFTP *m_ftp;
     size_t m_ftpsize;
 
     wxFTP *m_ftp;
     size_t m_ftpsize;

+
+    DECLARE_NO_COPY_CLASS(wxInputFTPStream)

 };
 
 class wxOutputFTPStream : public wxSocketOutputStream
 };
 
 class wxOutputFTPStream : public wxSocketOutputStream


@@ -558,6 +560,8 @@ public:
     }
 
     wxFTP *m_ftp;
     }
 
     wxFTP *m_ftp;

+
+    DECLARE_NO_COPY_CLASS(wxOutputFTPStream)

 };
 
 wxSocketClient *wxFTP::GetPort()
 };
 
 wxSocketClient *wxFTP::GetPort()


@@ -890,7 +894,7 @@ wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {
  wxSocketBase *sock = GetPort();
  if (!sock)
 {
  wxSocketBase *sock = GetPort();
  if (!sock)

-  return FALSE;
+  return NULL;

  wxList *file_list = new wxList;
  wxString line;
  // NLST : List of Filenames (including Directory's !)
  wxList *file_list = new wxList;
  wxString line;
  // NLST : List of Filenames (including Directory's !)