Fix some -Wunreachable-code-aggressive errors.

Bug: chromium:1066980
Change-Id: I61a85828a61d17c131bdfabf3ace87e8ecdbf456
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/3019183
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>

3 files changed, 16 insertions, 19 deletions

diff --git a/tools/cddl/codegen.cc b/tools/cddl/codegen.cc
index 3f9222bd..a763b721 100644
--- a/tools/cddl/codegen.cc
+++ b/tools/cddl/codegen.cc
@@ -382,7 +382,7 @@ bool EnsureDependentTypeDefinitionsWritten(int fd,
     case CppType::Which::kVector: {
       return EnsureDependentTypeDefinitionsWritten(
           fd, *cpp_type.vector_type.element_type, defs);
-    } break;
+    }
     case CppType::Which::kEnum: {
       if (defs->find(cpp_type.name) != defs->end())
         return true;
@@ -407,7 +407,7 @@ bool EnsureDependentTypeDefinitionsWritten(int fd,
     case CppType::Which::kOptional: {
       return EnsureDependentTypeDefinitionsWritten(fd, *cpp_type.optional_type,
                                                    defs);
-    } break;
+    }
     case CppType::Which::kDiscriminatedUnion: {
       for (const auto* x : cpp_type.discriminated_union.members)
         if (!EnsureDependentTypeDefinitionsWritten(fd, *x, defs))
@@ -560,12 +560,10 @@ bool WriteEncoder(int fd,
         }
         return true;
       }
-      break;
     case CppType::Which::kUint64:
       dprintf(fd, "  CBOR_RETURN_ON_ERROR(cbor_encode_uint(&encoder%d, %s));\n",
               encoder_depth, ToUnderscoreId(name).c_str());
       return true;
-      break;
     case CppType::Which::kString: {
       std::string cid = ToUnderscoreId(name);
       dprintf(fd, "  if (!IsValidUtf8(%s)) {\n", cid.c_str());
@@ -576,7 +574,7 @@ bool WriteEncoder(int fd,
               "%s.c_str(), %s.size()));\n",
               encoder_depth, cid.c_str(), cid.c_str());
       return true;
-    } break;
+    }
     case CppType::Which::kBytes: {
       std::string cid = ToUnderscoreId(name);
       dprintf(fd,
@@ -585,7 +583,7 @@ bool WriteEncoder(int fd,
               "%s.size()));\n",
               encoder_depth, cid.c_str(), cid.c_str());
       return true;
-    } break;
+    }
     case CppType::Which::kVector: {
       std::string cid = ToUnderscoreId(name);
       dprintf(fd, "  {\n");
@@ -620,14 +618,14 @@ bool WriteEncoder(int fd,
               encoder_depth, encoder_depth + 1);
       dprintf(fd, "  }\n");
       return true;
-    } break;
+    }
     case CppType::Which::kEnum: {
       dprintf(fd,
               "  CBOR_RETURN_ON_ERROR(cbor_encode_uint(&encoder%d, "
               "static_cast<uint64_t>(%s)));\n",
               encoder_depth, ToUnderscoreId(name).c_str());
       return true;
-    } break;
+    }
     case CppType::Which::kDiscriminatedUnion: {
       for (const auto* union_member : cpp_type.discriminated_union.members) {
         switch (union_member->which) {
@@ -671,7 +669,7 @@ bool WriteEncoder(int fd,
               ToCamelCase(cpp_type.name).c_str());
       dprintf(fd, "    return -CborUnknownError;\n");
       return true;
-    } break;
+    }
     case CppType::Which::kTaggedType: {
       dprintf(fd,
               "  CBOR_RETURN_ON_ERROR(cbor_encode_tag(&encoder%d, %" PRIu64
@@ -682,7 +680,7 @@ bool WriteEncoder(int fd,
         return false;
       }
       return true;
-    } break;
+    }
     default:
       break;
   }
@@ -1043,7 +1041,7 @@ bool WriteDecoder(int fd,
       dprintf(fd, "  CBOR_RETURN_ON_ERROR(cbor_value_advance_fixed(&it%d));\n",
               decoder_depth);
       return true;
-    } break;
+    }
     case CppType::Which::kString: {
       int temp_length = (*temporary_count)++;
       dprintf(fd, "  size_t length%d = 0;", temp_length);
@@ -1074,7 +1072,7 @@ bool WriteDecoder(int fd,
       dprintf(fd, "  CBOR_RETURN_ON_ERROR(cbor_value_advance(&it%d));\n",
               decoder_depth);
       return true;
-    } break;
+    }
     case CppType::Which::kBytes: {
       int temp_length = (*temporary_count)++;
       dprintf(fd, "  size_t length%d = 0;", temp_length);
@@ -1111,7 +1109,7 @@ bool WriteDecoder(int fd,
       dprintf(fd, "  CBOR_RETURN_ON_ERROR(cbor_value_advance(&it%d));\n",
               decoder_depth);
       return true;
-    } break;
+    }
     case CppType::Which::kVector: {
       dprintf(fd, "  if (cbor_value_get_type(&it%d) != CborArrayType) {\n",
               decoder_depth);
@@ -1158,7 +1156,7 @@ bool WriteDecoder(int fd,
           decoder_depth, decoder_depth + 1);
       dprintf(fd, "  }\n");
       return true;
-    } break;
+    }
     case CppType::Which::kEnum: {
       dprintf(fd,
               "  CBOR_RETURN_ON_ERROR(cbor_value_get_uint64(&it%d, "
@@ -1168,7 +1166,7 @@ bool WriteDecoder(int fd,
               decoder_depth);
       // TODO(btolsch): Validate against enum members.
       return true;
-    } break;
+    }
     case CppType::Which::kStruct: {
       if (cpp_type.struct_type.key_type == CppType::Struct::KeyType::kMap) {
         return WriteMapDecoder(fd, name, member_accessor,
@@ -1236,7 +1234,7 @@ bool WriteDecoder(int fd,
       }
       dprintf(fd, " else { return -1; }\n");
       return true;
-    } break;
+    }
     case CppType::Which::kTaggedType: {
       int temp_tag = (*temporary_count)++;
       dprintf(fd, "  uint64_t tag%d = 0;\n", temp_tag);
@@ -1254,7 +1252,7 @@ bool WriteDecoder(int fd,
         return false;
       }
       return true;
-    } break;
+    }
     default:
       break;
   }
diff --git a/tools/cddl/parse.cc b/tools/cddl/parse.cc
index cf4f15a0..439df8ff 100644
--- a/tools/cddl/parse.cc
+++ b/tools/cddl/parse.cc
@@ -428,7 +428,6 @@ AstNode* ParseGroupChoice(Parser* p) {
       return nullptr;
     }
   }
-  return nullptr;
 }
 
 AstNode* ParseGroup(Parser* p) {
diff --git a/tools/cddl/sema.cc b/tools/cddl/sema.cc
index 2ecb162a..584fe56f 100644
--- a/tools/cddl/sema.cc
+++ b/tools/cddl/sema.cc
@@ -722,7 +722,7 @@ CppType* MakeCppType(CppSymbolTable* table,
         cpp_type->discriminated_union.members.push_back(member);
       }
       return cpp_type;
-    } break;
+    }
     case CddlType::Which::kTaggedType: {
       cpp_type = GetCppType(table, name);
       cpp_type->which = CppType::Which::kTaggedType;