Fixes for previous fixes

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 58567d8950fb46e09a32d6d3b9a51494b9193744..83f419d5462d81d73abcec7c31979ed786b5f74f 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -804,7 +804,9 @@ int wxFTP::GetFileSize(const wxString& fileName)
             SetTransferMode(oldTransfermode);
         }
 
             SetTransferMode(oldTransfermode);
         }
 

-        if ( !ok ) // this is not a direct else clause.. The size command might return an invalid "2yz" reply
+        // this is not a direct else clause.. The size command might return an
+        // invalid "2yz" reply
+        if ( !ok )

         {
             // The server didn't understand the "SIZE"-command or it
             // returned an invalid reply.
         {
             // The server didn't understand the "SIZE"-command or it
             // returned an invalid reply.


@@ -849,12 +851,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
 
                             if ( wxSscanf(fileList[i].c_str(),
                                           _T("%*s %*s %*s %*s %i %*s %*s %*s %*s"),
 
                             if ( wxSscanf(fileList[i].c_str(),
                                           _T("%*s %*s %*s %*s %i %*s %*s %*s %*s"),

-                                          &filesize) == 9 )
-                            {
-                                // We've gotten a good response
-                                ok = TRUE;
-                            }
-                            else
+                                          &filesize) != 9 )

                             {
                                 // Hmm... Invalid response
                                 wxLogTrace(FTP_TRACE_MASK,
                             {
                                 // Hmm... Invalid response
                                 wxLogTrace(FTP_TRACE_MASK,


@@ -865,12 +862,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
                         {
                             if ( wxSscanf(fileList[i].c_str(),
                                           _T("%*s %*s %i %*s"),
                         {
                             if ( wxSscanf(fileList[i].c_str(),
                                           _T("%*s %*s %i %*s"),

-                                          &filesize) == 4 )
-                            {
-                                // valid response
-                                ok = TRUE;
-                            }
-                            else
+                                          &filesize) != 4 )

                             {
                                 // something bad happened..?
                                 wxLogTrace(FTP_TRACE_MASK,
                             {
                                 // something bad happened..?
                                 wxLogTrace(FTP_TRACE_MASK,