Add non-logging OpenFileForWrite() and OpenFileForReadAndWrite()

util/file/file_io_posix.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 53 matching lines @@
 
   return total_bytes;
 }
 
 }  // namespace
 
 namespace crashpad {
 
 namespace {
 
-FileHandle LoggingOpenFileForOutput(int rdwr_or_wronly,
-                                    const base::FilePath& path,
-                                    FileWriteMode mode,
-                                    FilePermissions permissions) {
-  int flags = rdwr_or_wronly & (O_RDWR | O_WRONLY);
-  DCHECK_NE(flags, 0);
+FileHandle OpenFileForOutput(int rdwr_or_wronly,
+                             const base::FilePath& path,
+                             FileWriteMode mode,
+                             FilePermissions permissions) {
+  DCHECK(rdwr_or_wronly & (O_RDWR | O_WRONLY));
+  DCHECK_EQ(rdwr_or_wronly & ~(O_RDWR | O_WRONLY), 0);
+
+  int flags = rdwr_or_wronly;
 
   switch (mode) {
     case FileWriteMode::kReuseOrFail:
       break;
     case FileWriteMode::kReuseOrCreate:
       flags |= O_CREAT;
       break;
     case FileWriteMode::kTruncateOrCreate:
       flags |= O_CREAT | O_TRUNC;
       break;
     case FileWriteMode::kCreateOrFail:
       flags |= O_CREAT | O_EXCL;
       break;
   }
 
-  int fd = HANDLE_EINTR(
+  return HANDLE_EINTR(
       open(path.value().c_str(),
            flags,
            permissions == FilePermissions::kWorldReadable ? 0644 : 0600));
-  PLOG_IF(ERROR, fd < 0) << "open " << path.value();
-  return fd;
 }
 
 }  // namespace
 
 ssize_t ReadFile(FileHandle file, void* buffer, size_t size) {
   return ReadOrWrite<ReadTraits>(file, buffer, size);
 }
 
 ssize_t WriteFile(FileHandle file, const void* buffer, size_t size) {
   return ReadOrWrite<WriteTraits>(file, buffer, size);
 }
 
+FileHandle OpenFileForRead(const base::FilePath& path) {
+  return HANDLE_EINTR(open(path.value().c_str(), O_RDONLY));
+}
+
+FileHandle OpenFileForWrite(const base::FilePath& path,
+                            FileWriteMode mode,
+                            FilePermissions permissions) {
+  return OpenFileForOutput(O_WRONLY, path, mode, permissions);
+}
+
+FileHandle OpenFileForReadAndWrite(const base::FilePath& path,
+                                   FileWriteMode mode,
+                                   FilePermissions permissions) {
+  return OpenFileForOutput(O_RDWR, path, mode, permissions);
+}
+
 FileHandle LoggingOpenFileForRead(const base::FilePath& path) {
-  int fd = HANDLE_EINTR(open(path.value().c_str(), O_RDONLY));
+  FileHandle fd = OpenFileForRead(path);
   PLOG_IF(ERROR, fd < 0) << "open " << path.value();
   return fd;
 }
 
 FileHandle LoggingOpenFileForWrite(const base::FilePath& path,
                                    FileWriteMode mode,
                                    FilePermissions permissions) {
-  return LoggingOpenFileForOutput(O_WRONLY, path, mode, permissions);
+  FileHandle fd = OpenFileForWrite(path, mode, permissions);
+  PLOG_IF(ERROR, fd < 0) << "open " << path.value();
+  return fd;
 }
 
 FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path,
                                           FileWriteMode mode,
                                           FilePermissions permissions) {
-  return LoggingOpenFileForOutput(O_RDWR, path, mode, permissions);
+  FileHandle fd = OpenFileForReadAndWrite(path, mode, permissions);
+  PLOG_IF(ERROR, fd < 0) << "open " << path.value();
+  return fd;
 }
 
 bool LoggingLockFile(FileHandle file, FileLocking locking) {
   int operation = (locking == FileLocking::kShared) ? LOCK_SH : LOCK_EX;
   int rv = HANDLE_EINTR(flock(file, operation));
   PLOG_IF(ERROR, rv != 0) << "flock";
   return rv == 0;
 }
 
 bool LoggingUnlockFile(FileHandle file) {
@@ skipping 16 matching lines @@
   return true;
 }
 
 bool LoggingCloseFile(FileHandle file) {
   int rv = IGNORE_EINTR(close(file));
   PLOG_IF(ERROR, rv != 0) << "close";
   return rv == 0;
 }
 
 }  // namespace crashpad