Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: net/ftp/ftp_directory_listing_parser.cc

Issue 662553002: Convert ARRAYSIZE_UNSAFE -> arraysize in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/dns/host_cache_unittest.cc ('k') | net/ftp/ftp_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/ftp/ftp_directory_listing_parser.h" 5 #include "net/ftp/ftp_directory_listing_parser.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/i18n/icu_encoding_detection.h" 9 #include "base/i18n/icu_encoding_detection.h"
10 #include "base/i18n/icu_string_conversions.h" 10 #include "base/i18n/icu_string_conversions.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 base::Bind(&ParseFtpDirectoryListingNetware, 70 base::Bind(&ParseFtpDirectoryListingNetware,
71 lines, current_time, entries), 71 lines, current_time, entries),
72 SERVER_NETWARE 72 SERVER_NETWARE
73 }, 73 },
74 { 74 {
75 base::Bind(&ParseFtpDirectoryListingOS2, lines, entries), 75 base::Bind(&ParseFtpDirectoryListingOS2, lines, entries),
76 SERVER_OS2 76 SERVER_OS2
77 } 77 }
78 }; 78 };
79 79
80 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(parsers); i++) { 80 for (size_t i = 0; i < arraysize(parsers); i++) {
81 entries->clear(); 81 entries->clear();
82 if (parsers[i].callback.Run()) { 82 if (parsers[i].callback.Run()) {
83 *server_type = parsers[i].server_type; 83 *server_type = parsers[i].server_type;
84 return FillInRawName(encoding, entries); 84 return FillInRawName(encoding, entries);
85 } 85 }
86 } 86 }
87 87
88 entries->clear(); 88 entries->clear();
89 return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT; 89 return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
90 } 90 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 int ParseFtpDirectoryListing(const std::string& text, 136 int ParseFtpDirectoryListing(const std::string& text,
137 const base::Time& current_time, 137 const base::Time& current_time,
138 std::vector<FtpDirectoryListingEntry>* entries) { 138 std::vector<FtpDirectoryListingEntry>* entries) {
139 FtpServerType server_type = SERVER_UNKNOWN; 139 FtpServerType server_type = SERVER_UNKNOWN;
140 int rv = DecodeAndParse(text, current_time, entries, &server_type); 140 int rv = DecodeAndParse(text, current_time, entries, &server_type);
141 UpdateFtpServerTypeHistograms(server_type); 141 UpdateFtpServerTypeHistograms(server_type);
142 return rv; 142 return rv;
143 } 143 }
144 144
145 } // namespace net 145 } // namespace net
OLDNEW
« no previous file with comments | « net/dns/host_cache_unittest.cc ('k') | net/ftp/ftp_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698