commit 6bdcc373ac7e633af04f180a96f0ed8df5d4b8b2
author Austin Schuh <austin.linux@gmail.com> Thu Jun 27 14:49:11 2024 -0700
committer Austin Schuh <austin.linux@gmail.com> Wed Jul 10 12:21:13 2024 -0700
tree 65ccbe993ae76d55506f89886895a5bf9a3ecb76
parent 93a83a2377a6785ebd40de83aa3953c3366134b1

Remove usage of CHECK_NOTNULL

We want to switch to absl logging instead of glog.  gtest and ceres are
going there, and we already have absl as a dependency.  ABSL doesn't
have CHECK_NOTNULL, and we can move things over in an easier to review
fashion.

Change-Id: Ifd9a11ec34a2357cec43f88dba015db9c28ed2cf
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/configuration.cc

diff --git a/aos/configuration.cc b/aos/configuration.cc
index cfc53a5..3b52e0c 100644
--- a/aos/configuration.cc
+++ b/aos/configuration.cc
@@ -1135,9 +1135,11 @@
     const flatbuffers::Vector<flatbuffers::Offset<aos::Map>> *maps,
     std::string_view type, const Node *node, std::set<std::string> *names) {
   for (const Map *map : *maps) {
-    CHECK_NOTNULL(map);
-    const Channel *const match = CHECK_NOTNULL(map->match());
-    const Channel *const rename = CHECK_NOTNULL(map->rename());
+    CHECK(map != nullptr);
+    const Channel *const match = map->match();
+    CHECK(match != nullptr);
+    const Channel *const rename = map->rename();
+    CHECK(rename != nullptr);
 
     // Handle type specific maps.
     const flatbuffers::String *const match_type_string = match->type();
@@ -1728,8 +1730,8 @@
   }
   CHECK(channel->has_source_node()) << FlatbufferToJson(channel);
   CHECK(node->has_name()) << FlatbufferToJson(node);
-  return (CHECK_NOTNULL(channel)->source_node()->string_view() ==
-          node->name()->string_view());
+  CHECK(channel != nullptr);
+  return (channel->source_node()->string_view() == node->name()->string_view());
 }
 
 bool ChannelIsReadableOnNode(const Channel *channel, const Node *node) {
@@ -1776,8 +1778,8 @@
     LOG(FATAL) << "Unsupported logging configuration in a single node world: "
                << CleanedChannelToString(channel);
   }
-  return ChannelMessageIsLoggedOnNode(
-      channel, CHECK_NOTNULL(node)->name()->string_view());
+  CHECK(node != nullptr);
+  return ChannelMessageIsLoggedOnNode(channel, node->name()->string_view());
 }
 
 bool ChannelMessageIsLoggedOnNode(const Channel *channel,
@@ -2116,7 +2118,7 @@
   flatbuffers::FlatBufferBuilder fbb;
   std::vector<flatbuffers::Offset<Channel>> new_channels_vec;
   for (const auto &channel : *configuration.channels()) {
-    CHECK_NOTNULL(channel);
+    CHECK(channel != nullptr);
     if (should_include_channel(*channel)) {
       new_channels_vec.push_back(RecursiveCopyFlatBuffer(channel, &fbb));
     }