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

Unified Diff: base/file_util_win.cc

Issue 14886003: Make base:ReplaceFile return an informative error. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change comment Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: base/file_util_win.cc
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 964302adce55b0cafab153460614e5bc2a81a1f3..66ed7283c1baca878466a263e248c4e80a8c68a0 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -148,8 +148,11 @@ bool MoveUnsafe(const FilePath& from_path, const FilePath& to_path) {
return ret;
}
-bool ReplaceFile(const FilePath& from_path, const FilePath& to_path) {
+bool ReplaceFile(const FilePath& from_path, const FilePath& to_path,
+ base::PlatformFileError* error) {
base::ThreadRestrictions::AssertIOAllowed();
+ if (error)
+ *error = base::PLATFORM_FILE_OK;
// Try a simple move first. It will only succeed when |to_path| doesn't
// already exist.
if (::MoveFile(from_path.value().c_str(), to_path.value().c_str()))
@@ -162,6 +165,8 @@ bool ReplaceFile(const FilePath& from_path, const FilePath& to_path) {
REPLACEFILE_IGNORE_MERGE_ERRORS, NULL, NULL)) {
return true;
}
+ if (error)
+ *error = base::LastErrorToPlatformFileError(GetLastError());
return false;
}

Powered by Google App Engine
This is Rietveld 408576698