commit a77939e368597241fe0153bedce196d7152a5de5
author Gabe Black <gabeblack@chromium.org> Tue Sep 09 23:35:08 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Sep 23 02:15:50 2014 +0000
tree 86ae4f5314a2fb6586f8722e2117f2fe80881554
parent b92cd2e0c4eb241eecffa6ad63efdd021a387f8b

update_engine: Use utils::FileSize when finding the size of a file.

The utils::FileSize funciton can find the size of a block device correctly.
Use it instead of the adhoc methods used around the codebase.

BUG=chromium:415867
TEST=Ran a butterfly-paladin tryjob with --hwtest.

Change-Id: Id6fd37f04b136b4265bde9b1f56c379a5d9c30f9
Reviewed-on: https://chromium-review.googlesource.com/217418
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>

extent_writer_unittest.cc

diff --git a/extent_writer_unittest.cc b/extent_writer_unittest.cc
index fef3343..a1b254d 100644
--- a/extent_writer_unittest.cc
+++ b/extent_writer_unittest.cc
@@ -70,9 +70,7 @@
   EXPECT_TRUE(direct_writer.Write(bytes.data(), bytes.size()));
   EXPECT_TRUE(direct_writer.End());
 
-  struct stat stbuf;
-  EXPECT_EQ(0, fstat(fd(), &stbuf));
-  EXPECT_EQ(kBlockSize + bytes.size(), stbuf.st_size);
+  EXPECT_EQ(kBlockSize + bytes.size(), utils::FileSize(fd()));
 
   vector<char> result_file;
   EXPECT_TRUE(utils::ReadFile(path(), &result_file));
@@ -139,9 +137,7 @@
   }
   EXPECT_TRUE(direct_writer.End());
 
-  struct stat stbuf;
-  EXPECT_EQ(0, fstat(fd(), &stbuf));
-  EXPECT_EQ(data.size(), stbuf.st_size);
+  EXPECT_EQ(data.size(), utils::FileSize(fd()));
 
   vector<char> result_file;
   EXPECT_TRUE(utils::ReadFile(path(), &result_file));
@@ -190,9 +186,7 @@
   ASSERT_TRUE(zero_pad_writer.Write(&data[0], bytes_to_write));
   EXPECT_TRUE(zero_pad_writer.End());
 
-  struct stat stbuf;
-  EXPECT_EQ(0, fstat(fd(), &stbuf));
-  EXPECT_EQ(data.size(), stbuf.st_size);
+  EXPECT_EQ(data.size(), utils::FileSize(fd()));
 
   vector<char> result_file;
   EXPECT_TRUE(utils::ReadFile(path(), &result_file));