webm_parser: Enable usage of werror.

Mass warning clean up. Mainly:
- Explicit casts of numeric literals to avoid signed/unsigned compare
  warnings.
- Commenting out of unused function arg names.

Change-Id: I0e70393a5743ae984035d43712c724d4ccd12f9d
This commit is contained in:
Tom Finegan
2016-08-08 14:47:42 -07:00
parent e1fe7627c8
commit d518128266
39 changed files with 346 additions and 324 deletions

View File

@@ -26,23 +26,24 @@ TEST_F(BufferReaderTest, Assignment) {
Status status;
BufferReader reader({});
EXPECT_EQ(0, reader.size());
const std::size_t kExpectedSize = 0;
EXPECT_EQ(kExpectedSize, reader.size());
status = reader.Read(buffer.size(), buffer.data(), &count);
EXPECT_EQ(Status::kEndOfFile, status.code);
EXPECT_EQ(0, count);
EXPECT_EQ(static_cast<std::uint64_t>(0), count);
reader = {1, 2, 3, 4};
EXPECT_EQ(4, reader.size());
EXPECT_EQ(static_cast<std::size_t>(4), reader.size());
status = reader.Read(2, buffer.data(), &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(2, count);
EXPECT_EQ(static_cast<std::uint64_t>(2), count);
reader = {5, 6, 7, 8};
status = reader.Read(2, buffer.data() + 2, &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(2, count);
EXPECT_EQ(static_cast<std::uint64_t>(2), count);
std::array<std::uint8_t, 4> expected = {{1, 2, 5, 6}};
EXPECT_EQ(expected, buffer);
@@ -58,11 +59,11 @@ TEST_F(BufferReaderTest, Empty) {
status = reader.Read(buffer.size(), buffer.data(), &count);
EXPECT_EQ(Status::kEndOfFile, status.code);
EXPECT_EQ(0, count);
EXPECT_EQ(static_cast<std::uint64_t>(0), count);
status = reader.Skip(1, &count);
EXPECT_EQ(Status::kEndOfFile, status.code);
EXPECT_EQ(0, count);
EXPECT_EQ(static_cast<std::uint64_t>(0), count);
}
TEST_F(BufferReaderTest, Read) {
@@ -75,18 +76,18 @@ TEST_F(BufferReaderTest, Read) {
status = reader.Read(5, buffer.data(), &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(5, count);
EXPECT_EQ(static_cast<std::uint64_t>(5), count);
status = reader.Read(10, buffer.data() + 5, &count);
EXPECT_EQ(Status::kOkPartial, status.code);
EXPECT_EQ(5, count);
EXPECT_EQ(static_cast<std::uint64_t>(5), count);
std::array<std::uint8_t, 15> expected = {{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}};
EXPECT_EQ(expected, buffer);
status = reader.Read(buffer.size(), buffer.data(), &count);
EXPECT_EQ(Status::kEndOfFile, status.code);
EXPECT_EQ(0, count);
EXPECT_EQ(static_cast<std::uint64_t>(0), count);
}
TEST_F(BufferReaderTest, Skip) {
@@ -98,15 +99,15 @@ TEST_F(BufferReaderTest, Skip) {
status = reader.Skip(3, &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(3, count);
EXPECT_EQ(static_cast<std::uint64_t>(3), count);
status = reader.Skip(10, &count);
EXPECT_EQ(Status::kOkPartial, status.code);
EXPECT_EQ(7, count);
EXPECT_EQ(static_cast<std::uint64_t>(7), count);
status = reader.Skip(1, &count);
EXPECT_EQ(Status::kEndOfFile, status.code);
EXPECT_EQ(0, count);
EXPECT_EQ(static_cast<std::uint64_t>(0), count);
}
TEST_F(BufferReaderTest, ReadAndSkip) {
@@ -120,15 +121,15 @@ TEST_F(BufferReaderTest, ReadAndSkip) {
status = reader.Read(5, buffer.data(), &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(5, count);
EXPECT_EQ(static_cast<std::uint64_t>(5), count);
status = reader.Skip(3, &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(3, count);
EXPECT_EQ(static_cast<std::uint64_t>(3), count);
status = reader.Read(5, buffer.data() + 5, &count);
EXPECT_EQ(Status::kOkPartial, status.code);
EXPECT_EQ(2, count);
EXPECT_EQ(static_cast<std::uint64_t>(2), count);
std::array<std::uint8_t, 10> expected = {{9, 8, 7, 6, 5, 1, 0, 0, 0, 0}};
EXPECT_EQ(expected, buffer);
@@ -140,22 +141,22 @@ TEST_F(BufferReaderTest, Position) {
Status status;
BufferReader reader({9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
EXPECT_EQ(0, reader.Position());
EXPECT_EQ(static_cast<std::uint64_t>(0), reader.Position());
status = reader.Read(5, buffer.data(), &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(5, count);
EXPECT_EQ(5, reader.Position());
EXPECT_EQ(static_cast<std::uint64_t>(5), count);
EXPECT_EQ(static_cast<std::uint64_t>(5), reader.Position());
status = reader.Skip(3, &count);
EXPECT_EQ(Status::kOkCompleted, status.code);
EXPECT_EQ(3, count);
EXPECT_EQ(8, reader.Position());
EXPECT_EQ(static_cast<std::uint64_t>(3), count);
EXPECT_EQ(static_cast<std::uint64_t>(8), reader.Position());
status = reader.Read(5, buffer.data() + 5, &count);
EXPECT_EQ(Status::kOkPartial, status.code);
EXPECT_EQ(2, count);
EXPECT_EQ(10, reader.Position());
EXPECT_EQ(static_cast<std::uint64_t>(2), count);
EXPECT_EQ(static_cast<std::uint64_t>(10), reader.Position());
std::array<std::uint8_t, 10> expected = {{9, 8, 7, 6, 5, 1, 0, 0, 0, 0}};
EXPECT_EQ(expected, buffer);