Fix clang-analyzer-core.NullDereference and avoid const_cast

ninja-build · Nov 7, 2024 · aeea0a4 · aeea0a4
1 parent 27c78a3
commit aeea0a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/deps_log.cc b/src/deps_log.cc
@@ -62,12 +62,11 @@ bool DepsLog::OpenForWrite(const string& path, string* err) {
 
 bool DepsLog::RecordDeps(Node* node, TimeStamp mtime,
                          const vector<Node*>& nodes) {
-  return RecordDeps(node, mtime, nodes.size(),
-                    nodes.empty() ? NULL : const_cast<Node**>(&nodes.front()));
+  return RecordDeps(node, mtime, nodes.size(), nodes.data());
 }
 
-bool DepsLog::RecordDeps(Node* node, TimeStamp mtime,
-                         int node_count, Node** nodes) {
+bool DepsLog::RecordDeps(Node* node, TimeStamp mtime, int node_count,
+                         Node* const* nodes) {
   // Track whether there's any new data to be recorded.
   bool made_change = false;
 

diff --git a/src/deps_log.h b/src/deps_log.h
@@ -72,7 +72,8 @@ struct DepsLog {
   // Writing (build-time) interface.
   bool OpenForWrite(const std::string& path, std::string* err);
   bool RecordDeps(Node* node, TimeStamp mtime, const std::vector<Node*>& nodes);
-  bool RecordDeps(Node* node, TimeStamp mtime, int node_count, Node** nodes);
+  bool RecordDeps(Node* node, TimeStamp mtime, int node_count,
+                  Node* const* nodes);
   void Close();
 
   // Reading (startup-time) interface.