[NaCl SDK] nacl_io: big refactor to return error value (errno).

native_client_sdk/src/libraries/nacl_io_test/mount_html5fs_test.cc

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <gmock/gmock.h>
 #include <ppapi/c/ppb_file_io.h>
@@ skipping 148 matching lines @@
   // Close.
   EXPECT_CALL(*ppapi_, ReleaseResource(fileref_resource_));
 }
 
 void MountHtml5FsNodeTest::InitFilesystem() {
   StringMap_t map;
   mnt_ = new MountHtml5FsMock(map, ppapi_);
 }
 
 void MountHtml5FsNodeTest::InitNode() {
-  node_ = mnt_->Open(Path(path_), O_CREAT | O_RDWR);
+  ASSERT_EQ(0, mnt_->Open(Path(path_), O_CREAT | O_RDWR, &node_));
   ASSERT_NE((MountNode*)NULL, node_);
 }
 
 // Node test where the filesystem is opened synchronously; that is, the
 // creation of the mount blocks until the filesystem is ready.
 class MountHtml5FsNodeSyncTest : public MountHtml5FsNodeTest {
  public:
   void SetUpForFileType(PP_FileType file_type);
 
   virtual void SetUp();
@@ skipping 191 matching lines @@
 }
 
 TEST_F(MountHtml5FsNodeSyncTest, Write) {
   const int offset = 10;
   const int count = 20;
   const char buffer[30] = {0};
 
   EXPECT_CALL(*fileio_, Write(fileio_resource_, offset, &buffer[0], count, _))
       .WillOnce(Return(count));
 
-  int result = node_->Write(offset, &buffer, count);
+  int result = 0;
+  EXPECT_EQ(0, node_->Write(offset, &buffer, count, &result));
   EXPECT_EQ(count, result);
 }
 
 TEST_F(MountHtml5FsNodeSyncTest, Read) {
   const int offset = 10;
   const int count = 20;
   char buffer[30] = {0};
 
   EXPECT_CALL(*fileio_, Read(fileio_resource_, offset, &buffer[0], count, _))
       .WillOnce(Return(count));
 
-  int result = node_->Read(offset, &buffer, count);
+  int result = 0;
+  EXPECT_EQ(0, node_->Read(offset, &buffer, count, &result));
   EXPECT_EQ(count, result);
 }
 
 TEST_F(MountHtml5FsNodeSyncTest, GetStat) {
   const int size = 123;
   const int creation_time = 1000;
   const int access_time = 2000;
   const int modified_time = 3000;
 
   PP_FileInfo info;
@@ skipping 26 matching lines @@
 
   int result = node_->FTruncate(size);
   EXPECT_EQ(0, result);
 }
 
 TEST_F(MountHtml5FsNodeSyncTest, GetDents) {
   struct dirent dirents[2];
   memset(&dirents[0], 0, sizeof(dirents));
 
   // Should fail for regular files.
-  int result = node_->GetDents(0, &dirents[0], sizeof(dirent) * 2);
-  ASSERT_EQ(-1, result);
-  ASSERT_EQ(ENOTDIR, errno);
+  int result_bytes = 0;
+  EXPECT_EQ(ENOTDIR, node_->GetDents(0, &dirents[0], sizeof(dirent) * 2,
+        &result_bytes));
+  ASSERT_EQ(0, result_bytes);
 }
 
 TEST_F(MountHtml5FsNodeSyncDirTest, OpenAndClose) {
 }
 
 TEST_F(MountHtml5FsNodeSyncDirTest, Write) {
   const int offset = 10;
   const int count = 20;
   const char buffer[30] = {0};
 
   // Should fail for directories.
-  int result = node_->Write(offset, &buffer, count);
-  ASSERT_EQ(-1, result);
-  EXPECT_EQ(EISDIR, errno);
+  int result_bytes = 0;
+  EXPECT_EQ(EISDIR, node_->Write(offset, &buffer, count, &result_bytes));
+  ASSERT_EQ(0, result_bytes);
 }
 
 TEST_F(MountHtml5FsNodeSyncDirTest, Read) {
   const int offset = 10;
   const int count = 20;
   char buffer[30] = {0};
 
   // Should fail for directories.
-  int result = node_->Read(offset, &buffer, count);
-  ASSERT_EQ(-1, result);
-  EXPECT_EQ(EISDIR, errno);
+  int result_bytes = 0;
+  EXPECT_EQ(EISDIR, node_->Read(offset, &buffer, count, &result_bytes));
+  ASSERT_EQ(0, result_bytes);
 }
 
 TEST_F(MountHtml5FsNodeSyncDirTest, GetStat) {
   const int creation_time = 1000;
   const int access_time = 2000;
   const int modified_time = 3000;
 
   PP_FileInfo info;
   info.size = 0;
   info.type = PP_FILETYPE_DIRECTORY;
@@ skipping 13 matching lines @@
   EXPECT_EQ(S_IFDIR | S_IWRITE | S_IREAD, statbuf.st_mode);
   EXPECT_EQ(0, statbuf.st_size);
   EXPECT_EQ(access_time, statbuf.st_atime);
   EXPECT_EQ(modified_time, statbuf.st_mtime);
   EXPECT_EQ(creation_time, statbuf.st_ctime);
 }
 
 TEST_F(MountHtml5FsNodeSyncDirTest, FTruncate) {
   const int size = 123;
   // Should fail for directories.
-  int result = node_->FTruncate(size);
-  ASSERT_EQ(-1, result);
-  EXPECT_EQ(EISDIR, errno);
+  EXPECT_EQ(EISDIR, node_->FTruncate(size));
 }
 
 TEST_F(MountHtml5FsNodeSyncDirTest, GetDents) {
   const int fileref_resource_1 = 238;
   const int fileref_resource_2 = 239;
 
   const int fileref_name_id_1 = 240;
   const char fileref_name_cstr_1[] = "bar";
   PP_Var fileref_name_1;
   fileref_name_1.type = PP_VARTYPE_STRING;
@@ skipping 21 matching lines @@
   EXPECT_CALL(*var, VarToUtf8(IsEqualToVar(fileref_name_2), _))
       .WillOnce(Return(fileref_name_cstr_2));
 
   EXPECT_CALL(*ppapi_, ReleaseResource(fileref_resource_1));
   EXPECT_CALL(*ppapi_, ReleaseResource(fileref_resource_2));
 
   struct dirent dirents[2];
   memset(&dirents[0], 0, sizeof(dirents));
   // +2 to test a size that is not a multiple of sizeof(dirent).
   // Expect it to round down.
-  int result = node_->GetDents(0, &dirents[0], sizeof(dirent) * 2 + 2);
+  int result_bytes = 0;
+  EXPECT_EQ(
+      0,
+      node_->GetDents(0, &dirents[0], sizeof(dirent) * 2 + 2, &result_bytes));
 
-  ASSERT_EQ(sizeof(dirent) * 2, result);
+  ASSERT_EQ(sizeof(dirent) * 2, result_bytes);
   EXPECT_LT(0, dirents[0].d_ino);  // 0 is an invalid inode number.
   EXPECT_EQ(sizeof(dirent), dirents[0].d_off);
   EXPECT_EQ(sizeof(dirent), dirents[0].d_reclen);
   EXPECT_STREQ(fileref_name_cstr_1, dirents[0].d_name);
   EXPECT_LT(0, dirents[1].d_ino);  // 0 is an invalid inode number.
   EXPECT_EQ(sizeof(dirent), dirents[1].d_off);
   EXPECT_EQ(sizeof(dirent), dirents[1].d_reclen);
   EXPECT_STREQ(fileref_name_cstr_2, dirents[1].d_name);
 }