fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 06:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added -Wzero-as-null-pointer-constant, replaced NULL --> UAVCAN_NULLPTR. All changes are automatic, no manual edits to the library code.

Browse Source
This commit is contained in:
Pavel Kirienko
2016-07-29 15:39:24 +03:00
parent b6fa34fed5
commit 38a241a90a
69 changed files with 306 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp
+6 -6
View File
@@ -84,7 +84,7 @@ private:
return &servers_[i];
}
}
return NULL;
return UAVCAN_NULLPTR;
}
virtual void handleTimerEvent(const TimerEvent&)
@@ -338,7 +338,7 @@ public:
Log::Index getServerNextIndex(NodeID server_node_id) const
{
const Server* const s = findServer(server_node_id);
if (s != NULL)
if (s != UAVCAN_NULLPTR)
{
return s->next_index;
}
@@ -349,7 +349,7 @@ public:
void incrementServerNextIndexBy(NodeID server_node_id, Log::Index increment)
{
Server* const s = findServer(server_node_id);
if (s != NULL)
if (s != UAVCAN_NULLPTR)
{
s->next_index = Log::Index(s->next_index + increment);
}
@@ -362,7 +362,7 @@ public:
void decrementServerNextIndex(NodeID server_node_id)
{
Server* const s = findServer(server_node_id);
if (s != NULL)
if (s != UAVCAN_NULLPTR)
{
s->next_index--;
}
@@ -378,7 +378,7 @@ public:
Log::Index getServerMatchIndex(NodeID server_node_id) const
{
const Server* const s = findServer(server_node_id);
if (s != NULL)
if (s != UAVCAN_NULLPTR)
{
return s->match_index;
}
@@ -389,7 +389,7 @@ public:
void setServerMatchIndex(NodeID server_node_id, Log::Index match_index)
{
Server* const s = findServer(server_node_id);
if (s != NULL)
if (s != UAVCAN_NULLPTR)
{
s->match_index = match_index;
}
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
+1 -1
View File
@@ -285,7 +285,7 @@ public:
const Entry* getEntryAtIndex(Index index) const
{
UAVCAN_ASSERT(last_index_ < Capacity);
return (index <= last_index_) ? &entries_[index] : NULL;
return (index <= last_index_) ? &entries_[index] : UAVCAN_NULLPTR;
}
Index getLastIndex() const { return last_index_; }
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
+1 -1
View File
@@ -63,7 +63,7 @@ public:
}
const Entry* const last_entry = log_.getEntryAtIndex(log_.getLastIndex());
if (last_entry == NULL)
if (last_entry == UAVCAN_NULLPTR)
{
UAVCAN_ASSERT(0);
return -ErrLogic;
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
+7 -6
View File
@@ -143,9 +143,10 @@ private:
UAVCAN_ASSERT(commit_index_ <= persistent_state_.getLog().getLastIndex());
// Term
UAVCAN_ASSERT(persistent_state_.getLog().getEntryAtIndex(persistent_state_.getLog().getLastIndex()) != NULL);
UAVCAN_ASSERT(persistent_state_.getLog().getEntryAtIndex(persistent_state_.getLog().getLastIndex())->term
<= persistent_state_.getCurrentTerm());
UAVCAN_ASSERT(persistent_state_.getLog().getEntryAtIndex(persistent_state_.getLog().getLastIndex()) !=
UAVCAN_NULLPTR);
UAVCAN_ASSERT(persistent_state_.getLog().getEntryAtIndex(persistent_state_.getLog().getLastIndex())->term <=
persistent_state_.getCurrentTerm());
// Elections
UAVCAN_ASSERT(server_state_ != ServerStateCandidate || !request_vote_client_.hasPendingCalls() ||
@@ -281,7 +282,7 @@ private:
req.prev_log_index = Log::Index(cluster_.getServerNextIndex(node_id) - 1U);
const Entry* const entry = persistent_state_.getLog().getEntryAtIndex(req.prev_log_index);
if (entry == NULL)
if (entry == UAVCAN_NULLPTR)
{
UAVCAN_ASSERT(0);
handlePersistentStateUpdateError(-ErrLogic);
@@ -470,7 +471,7 @@ private:
* Reject the request if the assumed log index does not exist on the local node.
*/
const Entry* const prev_entry = persistent_state_.getLog().getEntryAtIndex(request.prev_log_index);
if (prev_entry == NULL)
if (prev_entry == UAVCAN_NULLPTR)
{
response.setResponseEnabled(true);
return;
@@ -880,7 +881,7 @@ public:
for (int index = static_cast<int>(persistent_state_.getLog().getLastIndex()); index >= 0; index--)
{
const Entry* const entry = persistent_state_.getLog().getEntryAtIndex(Log::Index(index));
UAVCAN_ASSERT(entry != NULL);
UAVCAN_ASSERT(entry != UAVCAN_NULLPTR);
const LogEntryInfo info(*entry, Log::Index(index) <= commit_index_);
if (predicate(info))
{
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
+3 -3
View File
@@ -154,7 +154,7 @@ class UAVCAN_EXPORT Server : public AbstractServer
return;
}
const UniqueID uid = (unique_id_or_null == NULL) ? UniqueID() : *unique_id_or_null;
const UniqueID uid = (unique_id_or_null == UAVCAN_NULLPTR) ? UniqueID() : *unique_id_or_null;
if (raft_core_.isLeader())
{
@@ -327,8 +327,8 @@ struct StateReport
, num_unknown_nodes (s.getNodeDiscoverer().getNumUnknownNodes())
{
const Entry* const e = s.getRaftCore().getPersistentState().getLog().getEntryAtIndex(last_log_index);
UAVCAN_ASSERT(e != NULL);
if (e != NULL)
UAVCAN_ASSERT(e != UAVCAN_NULLPTR);
if (e != UAVCAN_NULLPTR)
{
last_log_term = e->term;
}