Various cleanups FTP-related.

net/url_request/url_request_new_ftp_job.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_new_ftp_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
@@ skipping 282 matching lines @@
         }
         break;
       case '?':  // Junk entry.
       case '"':  // Comment entry.
         break;
       default:
         NOTREACHED();
         break;
     }
   }
-  LogFtpServerType(state);
+
+  // We can't recognize server type based on empty directory listings. Only log
+  // server type when we have enough data to recognize one.
+  if (state.parsed_one)
+    LogFtpServerType(state.lstyle);
+
   directory_html_.append(file_entry);
   size_t bytes_to_copy = std::min(static_cast<size_t>(buf_size),
                                   directory_html_.length());
   if (bytes_to_copy) {
     memcpy(buf->data(), directory_html_.c_str(), bytes_to_copy);
     directory_html_.erase(0, bytes_to_copy);
   }
   return bytes_to_copy;
 }
 
-void URLRequestNewFtpJob::LogFtpServerType(
-    const struct net::list_state& list_state) {
-  // We can't recognize server type based on empty directory listings. Don't log
-  // that as unknown, it's misleading.
-  if (!list_state.parsed_one)
-    return;
-
-  switch (list_state.lstyle) {
+void URLRequestNewFtpJob::LogFtpServerType(char server_type) {

[wtc, 2009/09/18 17:24:39]

Nit: may want to name the parameter "list_style" and declare
it as 'int' because state.lstyle is an 'int'.  (It's
conventional in C code to use the 'int' type for
function parameters that are 'char'.  I don't know why.)

+  switch (server_type) {
     case 'E':
       net::UpdateFtpServerTypeHistograms(net::SERVER_EPLF);
       break;
     case 'V':
       net::UpdateFtpServerTypeHistograms(net::SERVER_VMS);
       break;
     case 'C':
       net::UpdateFtpServerTypeHistograms(net::SERVER_CMS);
       break;
     case 'W':
@@ skipping 101 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       this, &URLRequestNewFtpJob::OnStartCompleted, rv));
 }
 
 void URLRequestNewFtpJob::DestroyTransaction() {
   DCHECK(transaction_.get());
 
   transaction_.reset();
   response_info_ = NULL;
 }