Standardize StringToInt{,64} interface.

net/ftp/ftp_util.cc

 // Copyright (c) 2011 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/ftp/ftp_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
+#include "base/string_piece.h"
 #include "base/string_split.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "unicode/datefmt.h"
 #include "unicode/dtfmtsym.h"
 #include "unicode/uchar.h"
 
+using base::StringPiece16;
+
 // For examples of Unix<->VMS path conversions, see the unit test file. On VMS
 // a path looks differently depending on whether it's a file or directory.
 
 namespace net {
 
 // static
 std::string FtpUtil::UnixFilePathToVMS(const std::string& unix_path) {
   if (unix_path.empty())
     return std::string();
 
@@ skipping 170 matching lines @@
     return false;
 
   if (!base::StringToInt(day, &time_exploded.day_of_month))
     return false;
   if (time_exploded.day_of_month > 31)
     return false;
 
   if (!base::StringToInt(rest, &time_exploded.year)) {
     // Maybe it's time. Does it look like time (HH:MM)?
     if (rest.length() == 5 && rest[2] == ':') {
-      if (!base::StringToInt(rest.begin(),
-                             rest.begin() + 2,
+      if (!base::StringToInt(StringPiece16(rest.begin(), rest.begin() + 2),
                              &time_exploded.hour))

[erikwright (departed), 2011/12/14 04:24:08]

need {} around if and else blocks when condition wraps.

         return false;
 
-      if (!base::StringToInt(rest.begin() + 3,
-                             rest.begin() + 5,
+      if (!base::StringToInt(StringPiece16(rest.begin() + 3, rest.begin() + 5),

[erikwright (departed), 2011/12/14 04:24:08]

need {} around if and else blocks when condition wraps.

                              &time_exploded.minute))
         return false;
     } else if (rest.length() == 4 && rest[1] == ':') {
       // Sometimes it's just H:MM.
-      if (!base::StringToInt(rest.begin(),
-                             rest.begin() + 1,
+      if (!base::StringToInt(StringPiece16(rest.begin(), rest.begin() + 1),

[erikwright (departed), 2011/12/14 04:24:08]

need {} around if and else blocks when condition wraps.

                              &time_exploded.hour))
         return false;
 
-      if (!base::StringToInt(rest.begin() + 2,
-                             rest.begin() + 4,
+      if (!base::StringToInt(StringPiece16(rest.begin() + 2, rest.begin() + 4),

[erikwright (departed), 2011/12/14 04:24:08]

need {} around if and else blocks when condition wraps.

                              &time_exploded.minute))
         return false;
     } else {
       return false;
     }
 
     // Guess the year.
     base::Time::Exploded current_exploded;
     current_time.LocalExplode(&current_exploded);
 
@@ skipping 88 matching lines @@
     while (!iter.end() && !u_isspace(iter.get()))
       iter.Advance();
   }
 
   string16 result(text.substr(iter.array_pos()));
   TrimWhitespace(result, TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace