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

Side by Side Diff: base/platform_file_posix.cc

Issue 100253002: Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « base/message_loop/message_pump_libevent_unittest.cc ('k') | base/posix/eintr_wrapper.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/platform_file.h" 5 #include "base/platform_file.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <errno.h> 8 #include <errno.h>
9 #include <sys/stat.h> 9 #include <sys/stat.h>
10 #include <unistd.h> 10 #include <unistd.h>
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 return descriptor; 214 return descriptor;
215 } 215 }
216 216
217 FILE* FdopenPlatformFile(PlatformFile file, const char* mode) { 217 FILE* FdopenPlatformFile(PlatformFile file, const char* mode) {
218 return fdopen(file, mode); 218 return fdopen(file, mode);
219 } 219 }
220 #endif // !defined(OS_NACL) 220 #endif // !defined(OS_NACL)
221 221
222 bool ClosePlatformFile(PlatformFile file) { 222 bool ClosePlatformFile(PlatformFile file) {
223 base::ThreadRestrictions::AssertIOAllowed(); 223 base::ThreadRestrictions::AssertIOAllowed();
224 return !HANDLE_EINTR(close(file)); 224 return !IGNORE_EINTR(close(file));
225 } 225 }
226 226
227 int64 SeekPlatformFile(PlatformFile file, 227 int64 SeekPlatformFile(PlatformFile file,
228 PlatformFileWhence whence, 228 PlatformFileWhence whence,
229 int64 offset) { 229 int64 offset) {
230 base::ThreadRestrictions::AssertIOAllowed(); 230 base::ThreadRestrictions::AssertIOAllowed();
231 if (file < 0 || offset < 0) 231 if (file < 0 || offset < 0)
232 return -1; 232 return -1;
233 233
234 return lseek(file, static_cast<off_t>(offset), static_cast<int>(whence)); 234 return lseek(file, static_cast<off_t>(offset), static_cast<int>(whence));
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 default: 456 default:
457 #if !defined(OS_NACL) // NaCl build has no metrics code. 457 #if !defined(OS_NACL) // NaCl build has no metrics code.
458 UMA_HISTOGRAM_SPARSE_SLOWLY("PlatformFile.UnknownErrors.Posix", 458 UMA_HISTOGRAM_SPARSE_SLOWLY("PlatformFile.UnknownErrors.Posix",
459 saved_errno); 459 saved_errno);
460 #endif 460 #endif
461 return PLATFORM_FILE_ERROR_FAILED; 461 return PLATFORM_FILE_ERROR_FAILED;
462 } 462 }
463 } 463 }
464 464
465 } // namespace base 465 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_pump_libevent_unittest.cc ('k') | base/posix/eintr_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698