Use base::Time::Exploded instead of struct tm in...

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 59 matching lines @@
       read_in_progress_(false),
       context_(request->context()) {
 }
 
 URLRequestNewFtpJob::~URLRequestNewFtpJob() {
 }
 
 // static
 URLRequestJob* URLRequestNewFtpJob::Factory(URLRequest* request,
                                             const std::string& scheme) {
-  DCHECK(scheme == "ftp");
+  DCHECK_EQ(scheme, "ftp");
 
   if (request->url().has_port() &&
       !net::IsPortAllowedByFtp(request->url().IntPort()))
     return new URLRequestErrorJob(request, net::ERR_UNSAFE_PORT);
 
   DCHECK(request->context());
   DCHECK(request->context()->ftp_transaction_factory());
   return new URLRequestNewFtpJob(request);
 }
 
@@ skipping 102 matching lines @@
   // to FEAT command includes 'UTF8').
   // See http://wiki.filezilla-project.org/Character_Set
   if (encoding_.empty())
     encoding_ = DetectEncoding(buf->data(), bytes_read);
 
   int64 file_size;
   std::istringstream iss(buf->data());
   while (getline(iss, line)) {
     struct net::ListState state;
     struct net::ListResult result;
-    base::Time::Exploded et;
     std::replace(line.begin(), line.end(), '\r', '\0');
     net::LineType line_type = ParseFTPLine(line.c_str(), &state, &result);
     switch (line_type) {
       case net::FTP_TYPE_DIRECTORY:
-        // TODO(ibrar): There is some problem in ParseFTPLine function or
-        // in conversion between tm and base::Time::Exploded.
-        // It returns wrong date/time (Differnce is 1 day and 17 Hours).
-        memset(&et, 0, sizeof(base::Time::Exploded));
-        et.second = result.fe_time.tm_sec;
-        et.minute = result.fe_time.tm_min;
-        et.hour = result.fe_time.tm_hour;
-        et.day_of_month = result.fe_time.tm_mday;
-        et.month = result.fe_time.tm_mon + 1;
-        et.year = result.fe_time.tm_year + 1900;
-        et.day_of_week = result.fe_time.tm_wday;
-
         file_entry.append(net::GetDirectoryListingEntry(
             RawByteSequenceToFilename(result.fe_fname, encoding_),
-            result.fe_fname, true, 0, base::Time::FromLocalExploded(et)));
+            result.fe_fname, true, 0,
+            base::Time::FromLocalExploded(result.fe_time)));
         break;
       case net::FTP_TYPE_FILE:
-        // TODO(ibrar): There should be a way to create a Time object based
-        // on "tm" structure. This will remove bunch of line of code to convert
-        // tm to Time object.
-        memset(&et, 0, sizeof(base::Time::Exploded));
-        et.second = result.fe_time.tm_sec;
-        et.minute = result.fe_time.tm_min;
-        et.hour = result.fe_time.tm_hour;
-        et.day_of_month = result.fe_time.tm_mday;
-        et.month = result.fe_time.tm_mon + 1;
-        et.year = result.fe_time.tm_year + 1900;
-        et.day_of_week = result.fe_time.tm_wday;
-        // TODO(ibrar): There is some problem in ParseFTPLine function or
-        // in conversion between tm and base::Time::Exploded.
-        // It returns wrong date/time (Differnce is 1 day and 17 Hours).
         if (StringToInt64(result.fe_size, &file_size))
           file_entry.append(net::GetDirectoryListingEntry(
               RawByteSequenceToFilename(result.fe_fname, encoding_),
               result.fe_fname, false, file_size,
-              base::Time::FromLocalExploded(et)));
+              base::Time::FromLocalExploded(result.fe_time)));
         break;
       case net::FTP_TYPE_SYMLINK:
       case net::FTP_TYPE_JUNK:
       case net::FTP_TYPE_COMMENT:
         break;
       default:
         break;
     }
   }
   directory_html_.append(file_entry);
@@ skipping 66 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       this, &URLRequestNewFtpJob::OnStartCompleted, rv));
 }
 
 void URLRequestNewFtpJob::DestroyTransaction() {
   DCHECK(transaction_.get());
 
   transaction_.reset();
   response_info_ = NULL;
 }