generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webm_parser: Enable usage of werror.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
webm_parser/src/block_parser.cc
View File

@@ -22,7 +22,7 @@ namespace {
// The ParseBasicBlockFlags functions parse extra flag bits into the block,
// depending on the type of block that is being parsed.
void ParseBasicBlockFlags(std::uint8_t flags, Block* block) {
void ParseBasicBlockFlags(std::uint8_t /* flags */, Block* /* block */) {
// Block has no extra flags that aren't already handled.
}
@@ -150,7 +150,7 @@ Status BasicBlockParser<T>::Feed(Callback* callback, Reader* reader,
case State::kReadingXiphLaceSizes:
assert(value_.num_frames > 0);
while (lace_sizes_.size() < value_.num_frames - 1) {
while (static_cast<int>(lace_sizes_.size()) < value_.num_frames - 1) {
std::uint8_t byte;
do {
status = ReadByte(reader, &byte);
@@ -185,7 +185,7 @@ Status BasicBlockParser<T>::Feed(Callback* callback, Reader* reader,
case State::kReadingEbmlLaceSizes:
assert(value_.num_frames > 0);
assert(!lace_sizes_.empty());
while (lace_sizes_.size() < value_.num_frames - 1) {
while (static_cast<int>(lace_sizes_.size()) < value_.num_frames - 1) {
status = uint_parser_.Feed(callback, reader, &local_num_bytes_read);
*num_bytes_read += local_num_bytes_read;
header_bytes_read_ += local_num_bytes_read;
@@ -250,7 +250,7 @@ Status BasicBlockParser<T>::Feed(Callback* callback, Reader* reader,
case State::kReadingFrames:
assert(value_.num_frames > 0);
assert(lace_sizes_.size() == value_.num_frames);
assert(static_cast<int>(lace_sizes_.size()) == value_.num_frames);
for (; current_lace_ < lace_sizes_.size(); ++current_lace_) {
const std::uint64_t original = lace_sizes_[current_lace_];
status = callback->OnFrame(frame_metadata_, reader,

66
webm_parser/src/callback.cc
View File

@@ -11,14 +11,14 @@
namespace webm {
Status Callback::OnElementBegin(const ElementMetadata& metadata,
Status Callback::OnElementBegin(const ElementMetadata& /* metadata */,
Action* action) {
assert(action != nullptr);
*action = Action::kRead;
return Status(Status::kOkCompleted);
}
Status Callback::OnUnknownElement(const ElementMetadata& metadata,
Status Callback::OnUnknownElement(const ElementMetadata& /* metadata */,
Reader* reader,
std::uint64_t* bytes_remaining) {
assert(reader != nullptr);
@@ -26,108 +26,112 @@ Status Callback::OnUnknownElement(const ElementMetadata& metadata,
return Skip(reader, bytes_remaining);
}
Status Callback::OnEbml(const ElementMetadata& metadata, const Ebml& ebml) {
Status Callback::OnEbml(const ElementMetadata& /* metadata */,
const Ebml& /* ebml */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnVoid(const ElementMetadata& metadata, Reader* reader,
Status Callback::OnVoid(const ElementMetadata& /* metadata */, Reader* reader,
std::uint64_t* bytes_remaining) {
assert(reader != nullptr);
assert(bytes_remaining != nullptr);
return Skip(reader, bytes_remaining);
}
Status Callback::OnSegmentBegin(const ElementMetadata& metadata,
Status Callback::OnSegmentBegin(const ElementMetadata& /* metadata */,
Action* action) {
assert(action != nullptr);
*action = Action::kRead;
return Status(Status::kOkCompleted);
}
Status Callback::OnSeek(const ElementMetadata& metadata, const Seek& seek) {
Status Callback::OnSeek(const ElementMetadata& /* metadata */,
const Seek& /* seek */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnInfo(const ElementMetadata& metadata, const Info& info) {
Status Callback::OnInfo(const ElementMetadata& /* metadata */,
const Info& /* info */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnClusterBegin(const ElementMetadata& metadata,
const Cluster& cluster, Action* action) {
Status Callback::OnClusterBegin(const ElementMetadata& /* metadata */,
const Cluster& /* cluster */, Action* action) {
assert(action != nullptr);
*action = Action::kRead;
return Status(Status::kOkCompleted);
}
Status Callback::OnSimpleBlockBegin(const ElementMetadata& metadata,
const SimpleBlock& simple_block,
Status Callback::OnSimpleBlockBegin(const ElementMetadata& /* metadata */,
const SimpleBlock& /* simple_block */,
Action* action) {
assert(action != nullptr);
*action = Action::kRead;
return Status(Status::kOkCompleted);
}
Status Callback::OnSimpleBlockEnd(const ElementMetadata& metadata,
const SimpleBlock& simple_block) {
Status Callback::OnSimpleBlockEnd(const ElementMetadata& /* metadata */,
const SimpleBlock& /* simple_block */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnBlockGroupBegin(const ElementMetadata& metadata,
Status Callback::OnBlockGroupBegin(const ElementMetadata& /* metadata */,
Action* action) {
assert(action != nullptr);
*action = Action::kRead;
return Status(Status::kOkCompleted);
}
Status Callback::OnBlockBegin(const ElementMetadata& metadata,
const Block& block, Action* action) {
Status Callback::OnBlockBegin(const ElementMetadata& /* metadata */,
const Block& /* block */, Action* action) {
assert(action != nullptr);
*action = Action::kRead;
return Status(Status::kOkCompleted);
}
Status Callback::OnBlockEnd(const ElementMetadata& metadata,
const Block& block) {
Status Callback::OnBlockEnd(const ElementMetadata& /* metadata */,
const Block& /* block */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnBlockGroupEnd(const ElementMetadata& metadata,
const BlockGroup& block_group) {
Status Callback::OnBlockGroupEnd(const ElementMetadata& /* metadata */,
const BlockGroup& /* block_group */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnFrame(const FrameMetadata& metadata, Reader* reader,
Status Callback::OnFrame(const FrameMetadata& /* metadata */, Reader* reader,
std::uint64_t* bytes_remaining) {
assert(reader != nullptr);
assert(bytes_remaining != nullptr);
return Skip(reader, bytes_remaining);
}
Status Callback::OnClusterEnd(const ElementMetadata& metadata,
const Cluster& cluster) {
Status Callback::OnClusterEnd(const ElementMetadata& /* metadata */,
const Cluster& /* cluster */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnTrackEntry(const ElementMetadata& metadata,
const TrackEntry& track_entry) {
Status Callback::OnTrackEntry(const ElementMetadata& /* metadata */,
const TrackEntry& /* track_entry */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnCuePoint(const ElementMetadata& metadata,
const CuePoint& cue_point) {
Status Callback::OnCuePoint(const ElementMetadata& /* metadata */,
const CuePoint& /* cue_point */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnEditionEntry(const ElementMetadata& metadata,
const EditionEntry& edition_entry) {
Status Callback::OnEditionEntry(const ElementMetadata& /* metadata */,
const EditionEntry& /* edition_entry */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnTag(const ElementMetadata& metadata, const Tag& tag) {
Status Callback::OnTag(const ElementMetadata& /* metadata */,
const Tag& /* tag */) {
return Status(Status::kOkCompleted);
}
Status Callback::OnSegmentEnd(const ElementMetadata& metadata) {
Status Callback::OnSegmentEnd(const ElementMetadata& /* metadata */) {
return Status(Status::kOkCompleted);
}

4
webm_parser/src/element_parser.h
View File

@@ -71,8 +71,8 @@ class ElementParser : public Parser {
// this parser is the first element in child_ancestory, or if that is empty,
// then child_metadata itself. If the child is not a valid child of this
// parser, then a debug assertion is made (because that indicates a bug).
virtual void InitAfterSeek(const Ancestory& child_ancestory,
const ElementMetadata& child_metadata) {
virtual void InitAfterSeek(const Ancestory& /* child_ancestory */,
const ElementMetadata& /* child_metadata */) {
assert(false);
}

2
webm_parser/src/istream_reader.cc
View File

@@ -62,7 +62,7 @@ Status IstreamReader::Read(std::size_t num_to_read, std::uint8_t* buffer,
return Status(Status::kEndOfFile);
}
if (actual == num_to_read) {
if (static_cast<std::size_t>(actual) == num_to_read) {
return Status(Status::kOkCompleted);
} else {
return Status(Status::kOkPartial);

2
webm_parser/src/master_value_parser.h
View File

@@ -325,7 +325,7 @@ class MasterValueParser : public ElementParser {
// parsed for which NotifyOnParseComplete() was requested. The provided
// metadata is for the child element that has just completed parsing. By
// default this method does nothing.
virtual void OnChildParsed(const ElementMetadata& metadata) {}
virtual void OnChildParsed(const ElementMetadata& /* metadata */) {}
private:
T value_;

4
webm_parser/src/parser_utils.h
View File

@@ -38,11 +38,11 @@ Status AccumulateIntegerBytes(int num_to_read, Reader* reader, T* integer,
assert(integer != nullptr);
assert(num_actually_read != nullptr);
assert(num_to_read >= 0);
assert(num_to_read <= sizeof(T));
assert(static_cast<std::size_t>(num_to_read) <= sizeof(T));
*num_actually_read = 0;
if (num_to_read < 0 || num_to_read > sizeof(T)) {
if (num_to_read < 0 || static_cast<std::size_t>(num_to_read) > sizeof(T)) {
return Status(Status::kInvalidElementSize);
}

18
webm_parser/src/skip_callback.h
View File

@@ -20,39 +20,39 @@ namespace webm {
// if the callback ever needs to process data from the byte stream.
class SkipCallback : public Callback {
public:
Status OnElementBegin(const ElementMetadata& metadata,
Status OnElementBegin(const ElementMetadata& /* metadata */,
Action* action) override {
*action = Action::kSkip;
return Status(Status::kOkCompleted);
}
Status OnSegmentBegin(const ElementMetadata& metadata,
Status OnSegmentBegin(const ElementMetadata& /* metadata */,
Action* action) override {
*action = Action::kSkip;
return Status(Status::kOkCompleted);
}
Status OnClusterBegin(const ElementMetadata& metadata, const Cluster& cluster,
Action* action) override {
Status OnClusterBegin(const ElementMetadata& /* metadata */,
const Cluster& /* cluster */, Action* action) override {
*action = Action::kSkip;
return Status(Status::kOkCompleted);
}
Status OnSimpleBlockBegin(const ElementMetadata& metadata,
const SimpleBlock& simple_block,
Status OnSimpleBlockBegin(const ElementMetadata& /* metadata */,
const SimpleBlock& /* simple_block */,
Action* action) override {
*action = Action::kSkip;
return Status(Status::kOkCompleted);
}
Status OnBlockGroupBegin(const ElementMetadata& metadata,
Status OnBlockGroupBegin(const ElementMetadata& /* metadata */,
Action* action) override {
*action = Action::kSkip;
return Status(Status::kOkCompleted);
}
Status OnBlockBegin(const ElementMetadata& metadata, const Block& block,
Action* action) override {
Status OnBlockBegin(const ElementMetadata& /* metadata */,
const Block& /* block */, Action* action) override {
*action = Action::kSkip;
return Status(Status::kOkCompleted);
}