Skip to content

Commit

Permalink
Fix various unsigned to signed comparison warnings.
Browse files Browse the repository at this point in the history 
GCC aggressively emit warnings when comparing unsigned and signed integer types, which causes failures works under protobuf's -Werror default. We can fix these often by switching to iterators, but sometimes it's easiest to add a cast or switch a variable type.
  • Loading branch information
@benjaminp
benjaminp committed Jun 21, 2024
1 parent 0302c4c commit 420a4a4
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 41 deletions.
36 changes: 18 additions & 18 deletions src/google/protobuf/compiler/java/full/enum.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,30 +78,30 @@ void EnumNonLiteGenerator::Generate(io::Printer* printer) {

bool ordinal_is_index = true;
std::string index_text = "ordinal()";
for (int i = 0; i < canonical_values_.size(); i++) {
if (canonical_values_[i]->index() != i) {
for (size_t i = 0; i < canonical_values_.size(); i++) {
if (static_cast<size_t>(canonical_values_[i]->index()) != i) {
ordinal_is_index = false;
index_text = "index";
break;
}
}

for (int i = 0; i < canonical_values_.size(); i++) {
for (const auto& value : canonical_values_) {
absl::flat_hash_map<absl::string_view, std::string> vars;
vars["name"] = canonical_values_[i]->name();
vars["index"] = absl::StrCat(canonical_values_[i]->index());
vars["number"] = absl::StrCat(canonical_values_[i]->number());
WriteEnumValueDocComment(printer, canonical_values_[i],
vars["name"] = value->name();
vars["index"] = absl::StrCat(value->index());
vars["number"] = absl::StrCat(value->number());
WriteEnumValueDocComment(printer, value,
context_->options());
if (canonical_values_[i]->options().deprecated()) {
if (value->options().deprecated()) {
printer->Print("@java.lang.Deprecated\n");
}
if (ordinal_is_index) {
printer->Print(vars, "$name$($number$),\n");
} else {
printer->Print(vars, "$name$($index$, $number$),\n");
}
printer->Annotate("name", canonical_values_[i]);
printer->Annotate("name", value);
}

if (!descriptor_->is_closed()) {
Expand All @@ -126,15 +126,15 @@ void EnumNonLiteGenerator::Generate(io::Printer* printer) {
printer->Outdent();
printer->Print("}\n");

for (int i = 0; i < aliases_.size(); i++) {
for (const auto& alias : aliases_) {
absl::flat_hash_map<absl::string_view, std::string> vars;
vars["classname"] = descriptor_->name();
vars["name"] = aliases_[i].value->name();
vars["canonical_name"] = aliases_[i].canonical_value->name();
WriteEnumValueDocComment(printer, aliases_[i].value, context_->options());
vars["name"] = alias.value->name();
vars["canonical_name"] = alias.canonical_value->name();
WriteEnumValueDocComment(printer, alias.value, context_->options());
printer->Print(
vars, "public static final $classname$ $name$ = $canonical_name$;\n");
printer->Annotate("name", aliases_[i].value);
printer->Annotate("name", alias.value);
}

for (int i = 0; i < descriptor_->value_count(); i++) {
Expand Down Expand Up @@ -210,10 +210,10 @@ void EnumNonLiteGenerator::Generate(io::Printer* printer) {
printer->Indent();
printer->Indent();

for (int i = 0; i < canonical_values_.size(); i++) {
for (const auto& value : canonical_values_) {
printer->Print("case $number$: return $name$;\n", "name",
canonical_values_[i]->name(), "number",
absl::StrCat(canonical_values_[i]->number()));
value->name(), "number",
absl::StrCat(value->number()));
}

printer->Outdent();
Expand Down Expand Up @@ -385,7 +385,7 @@ void EnumNonLiteGenerator::Generate(io::Printer* printer) {


bool EnumNonLiteGenerator::CanUseEnumValues() {
if (canonical_values_.size() != descriptor_->value_count()) {
if (canonical_values_.size() != static_cast<size_t>(descriptor_->value_count())) {
return false;
}
for (int i = 0; i < descriptor_->value_count(); i++) {
Expand Down
3 changes: 1 addition & 2 deletions src/google/protobuf/compiler/java/full/message.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,8 +800,7 @@ void ImmutableMessageGenerator::GenerateDescriptorMethods(
" switch (number) {\n");
printer->Indent();
printer->Indent();
for (int i = 0; i < map_fields.size(); ++i) {
const FieldDescriptor* field = map_fields[i];
for (const auto& field : map_fields) {
const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
printer->Print(
"case $number$:\n"
Expand Down
6 changes: 2 additions & 4 deletions src/google/protobuf/compiler/java/full/message_builder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ void MessageBuilderGenerator::GenerateDescriptorMethods(io::Printer* printer) {
" switch (number) {\n");
printer->Indent();
printer->Indent();
for (int i = 0; i < map_fields.size(); ++i) {
const FieldDescriptor* field = map_fields[i];
for (const auto& field : map_fields) {
const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
printer->Print(
"case $number$:\n"
Expand All @@ -237,8 +236,7 @@ void MessageBuilderGenerator::GenerateDescriptorMethods(io::Printer* printer) {
" switch (number) {\n");
printer->Indent();
printer->Indent();
for (int i = 0; i < map_fields.size(); ++i) {
const FieldDescriptor* field = map_fields[i];
for (const auto& field : map_fields) {
const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
printer->Print(
"case $number$:\n"
Expand Down
28 changes: 14 additions & 14 deletions src/google/protobuf/compiler/java/lite/enum.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
printer->Annotate("classname", descriptor_);
printer->Indent();

for (int i = 0; i < canonical_values_.size(); i++) {
for (const auto& value : canonical_values_) {
absl::flat_hash_map<absl::string_view, std::string> vars;
vars["name"] = canonical_values_[i]->name();
vars["number"] = absl::StrCat(canonical_values_[i]->number());
WriteEnumValueDocComment(printer, canonical_values_[i],
vars["name"] = value->name();
vars["number"] = absl::StrCat(value->number());
WriteEnumValueDocComment(printer, value,
context_->options());
if (canonical_values_[i]->options().deprecated()) {
if (value->options().deprecated()) {
printer->Print("@java.lang.Deprecated\n");
}
printer->Print(vars, "$name$($number$),\n");
printer->Annotate("name", canonical_values_[i]);
printer->Annotate("name", value);
}

if (!descriptor_->is_closed()) {
Expand All @@ -86,15 +86,15 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {

// -----------------------------------------------------------------

for (int i = 0; i < aliases_.size(); i++) {
for (const auto& alias : aliases_) {
absl::flat_hash_map<absl::string_view, std::string> vars;
vars["classname"] = descriptor_->name();
vars["name"] = aliases_[i].value->name();
vars["canonical_name"] = aliases_[i].canonical_value->name();
WriteEnumValueDocComment(printer, aliases_[i].value, context_->options());
vars["name"] = alias.value->name();
vars["canonical_name"] = alias.canonical_value->name();
WriteEnumValueDocComment(printer, alias.value, context_->options());
printer->Print(
vars, "public static final $classname$ $name$ = $canonical_name$;\n");
printer->Annotate("name", aliases_[i].value);
printer->Annotate("name", alias.value);
}

for (int i = 0; i < descriptor_->value_count(); i++) {
Expand Down Expand Up @@ -157,10 +157,10 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
printer->Indent();
printer->Indent();

for (int i = 0; i < canonical_values_.size(); i++) {
for (const auto& value : canonical_values_) {
printer->Print("case $number$: return $name$;\n", "name",
canonical_values_[i]->name(), "number",
absl::StrCat(canonical_values_[i]->number()));
value->name(), "number",
absl::StrCat(value->number()));
}

printer->Outdent();
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/compiler/rust/relative_path.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ std::string RelativePath::Relative(const RelativePath& dest) const {
result.push_back(segment);
}
// Push `..` from the common ancestor to the current path.
for (int i = 0; i < current_segments.size(); ++i) {
for (size_t i = 0; i < current_segments.size(); ++i) {
result.push_back("..");
}
absl::c_reverse(result);
Expand Down
4 changes: 2 additions & 2 deletions src/google/protobuf/io/printer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ class AnnotationProtoCollector : public AnnotationCollector {
const std::string& file_path, const std::vector<int>& path,
absl::optional<Semantic> semantic) override {
auto* annotation = annotation_proto_->add_annotation();
for (int i = 0; i < path.size(); ++i) {
annotation->add_path(path[i]);
for (const auto segment : path) {
annotation->add_path(segment);
}
annotation->set_source_file(file_path);
annotation->set_begin(begin_offset);
Expand Down

0 comments on commit 420a4a4

Please sign in to comment.