Cross platform low level file IO wrappers

util/file/file_io_posix.cc

Index: util/file/file_io_posix.cc
diff --git a/util/file/fd_io.cc b/util/file/file_io_posix.cc
similarity index 60%
rename from util/file/fd_io.cc
rename to util/file/file_io_posix.cc
index cc97400ba34ba3e827a71f9c9dc1955ad18e1e8d..a1021fda29102c8f0ebe9c38a89ddc41bc96ba88 100644
--- a/util/file/fd_io.cc
+++ b/util/file/file_io_posix.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/file/fd_io.h"
+#include "util/file/file_io.h"
 
 #include <unistd.h>
 
@@ -66,70 +66,18 @@ ssize_t ReadOrWrite(int fd,
 
 namespace crashpad {
 
-ssize_t ReadFD(int fd, void* buffer, size_t size) {
+ssize_t ReadFile(int fd, void* buffer, size_t size) {

[Mark Mentovai, 2014/12/16 22:40:25]

This is now “FileHandle file”, not “int fd”. Same on lines 73 and 77.

It’s easier to match things up between the .h and .cc when these all agree.

[scottmg, 2014/12/17 00:22:58]

Done. (I left the implementation ones above to emphasize their concreteness.)

[Mark Mentovai, 2014/12/17 01:05:24]

scottmg wrote:
Perfect.

   return ReadOrWrite<ReadTraits>(fd, buffer, size);
 }
 
-ssize_t WriteFD(int fd, const void* buffer, size_t size) {
+ssize_t WriteFile(int fd, const void* buffer, size_t size) {
   return ReadOrWrite<WriteTraits>(fd, buffer, size);
 }
 
-bool LoggingReadFD(int fd, void* buffer, size_t size) {
-  ssize_t expect = base::checked_cast<ssize_t>(size);
-  ssize_t rv = ReadFD(fd, buffer, size);
-  if (rv < 0) {
-    PLOG(ERROR) << "read";
-    return false;
-  }
-  if (rv != expect) {
-    LOG(ERROR) << "read: expected " << expect << ", observed " << rv;
-    return false;
-  }
-
-  return true;
-}
-
-bool LoggingWriteFD(int fd, const void* buffer, size_t size) {
-  ssize_t expect = base::checked_cast<ssize_t>(size);
-  ssize_t rv = WriteFD(fd, buffer, size);
-  if (rv < 0) {
-    PLOG(ERROR) << "write";
-    return false;
-  }
-  if (rv != expect) {
-    LOG(ERROR) << "write: expected " << expect << ", observed " << rv;
-    return false;
-  }
-
-  return true;
-}
-
-void CheckedReadFD(int fd, void* buffer, size_t size) {
-  CHECK(LoggingReadFD(fd, buffer, size));
-}
-
-void CheckedWriteFD(int fd, const void* buffer, size_t size) {
-  CHECK(LoggingWriteFD(fd, buffer, size));
-}
-
-void CheckedReadFDAtEOF(int fd) {
-  char c;
-  ssize_t rv = ReadFD(fd, &c, 1);
-  if (rv < 0) {
-    PCHECK(rv == 0) << "read";
-  } else {
-    CHECK_EQ(rv, 0) << "read";
-  }
-}
-
-bool LoggingCloseFD(int fd) {
+bool LoggingCloseFile(int fd) {
   int rv = IGNORE_EINTR(close(fd));
   PLOG_IF(ERROR, rv != 0) << "close";
   return rv == 0;
 }
 
-void CheckedCloseFD(int fd) {
-  CHECK(LoggingCloseFD(fd));
-}
-
 }  // namespace crashpad