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

Side by Side Diff: base/files/file_enumerator_win.cc

Issue 1549853002: Switch to standard integer types in base/files/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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 | « base/files/file_enumerator_posix.cc ('k') | base/files/file_locking_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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/files/file_enumerator.h" 5 #include "base/files/file_enumerator.h"
6 6
7 #include <stdint.h>
7 #include <string.h> 8 #include <string.h>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "base/threading/thread_restrictions.h" 11 #include "base/threading/thread_restrictions.h"
11 #include "base/win/windows_version.h" 12 #include "base/win/windows_version.h"
12 13
13 namespace base { 14 namespace base {
14 15
15 // FileEnumerator::FileInfo ---------------------------------------------------- 16 // FileEnumerator::FileInfo ----------------------------------------------------
16 17
17 FileEnumerator::FileInfo::FileInfo() { 18 FileEnumerator::FileInfo::FileInfo() {
18 memset(&find_data_, 0, sizeof(find_data_)); 19 memset(&find_data_, 0, sizeof(find_data_));
19 } 20 }
20 21
21 bool FileEnumerator::FileInfo::IsDirectory() const { 22 bool FileEnumerator::FileInfo::IsDirectory() const {
22 return (find_data_.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; 23 return (find_data_.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
23 } 24 }
24 25
25 FilePath FileEnumerator::FileInfo::GetName() const { 26 FilePath FileEnumerator::FileInfo::GetName() const {
26 return FilePath(find_data_.cFileName); 27 return FilePath(find_data_.cFileName);
27 } 28 }
28 29
29 int64 FileEnumerator::FileInfo::GetSize() const { 30 int64_t FileEnumerator::FileInfo::GetSize() const {
30 ULARGE_INTEGER size; 31 ULARGE_INTEGER size;
31 size.HighPart = find_data_.nFileSizeHigh; 32 size.HighPart = find_data_.nFileSizeHigh;
32 size.LowPart = find_data_.nFileSizeLow; 33 size.LowPart = find_data_.nFileSizeLow;
33 DCHECK_LE(size.QuadPart, 34 DCHECK_LE(size.QuadPart,
34 static_cast<ULONGLONG>(std::numeric_limits<int64>::max())); 35 static_cast<ULONGLONG>(std::numeric_limits<int64_t>::max()));
35 return static_cast<int64>(size.QuadPart); 36 return static_cast<int64_t>(size.QuadPart);
36 } 37 }
37 38
38 base::Time FileEnumerator::FileInfo::GetLastModifiedTime() const { 39 base::Time FileEnumerator::FileInfo::GetLastModifiedTime() const {
39 return base::Time::FromFileTime(find_data_.ftLastWriteTime); 40 return base::Time::FromFileTime(find_data_.ftLastWriteTime);
40 } 41 }
41 42
42 // FileEnumerator -------------------------------------------------------------- 43 // FileEnumerator --------------------------------------------------------------
43 44
44 FileEnumerator::FileEnumerator(const FilePath& root_path, 45 FileEnumerator::FileEnumerator(const FilePath& root_path,
45 bool recursive, 46 bool recursive,
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 return cur_file; 157 return cur_file;
157 } else if (file_type_ & FileEnumerator::FILES) { 158 } else if (file_type_ & FileEnumerator::FILES) {
158 return cur_file; 159 return cur_file;
159 } 160 }
160 } 161 }
161 162
162 return FilePath(); 163 return FilePath();
163 } 164 }
164 165
165 } // namespace base 166 } // namespace base
OLDNEW
« no previous file with comments | « base/files/file_enumerator_posix.cc ('k') | base/files/file_locking_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698