From a6331cabdb80806abf1fbdb2b36976e793dc5119 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 5 Apr 2021 13:50:10 +0200 Subject: [PATCH] core: remove unneeded private data Just a small optimization for the statustext handler. --- src/core/mavlink_statustext_handler.cpp | 6 +++--- src/core/mavlink_statustext_handler.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/mavlink_statustext_handler.cpp b/src/core/mavlink_statustext_handler.cpp index 43e1116f6e..aaaa4c2f24 100644 --- a/src/core/mavlink_statustext_handler.cpp +++ b/src/core/mavlink_statustext_handler.cpp @@ -8,13 +8,13 @@ MavlinkStatustextHandler::process(const mavlink_statustext_t& statustext) { char text_with_null[sizeof(statustext.text) + 1]{}; strncpy(text_with_null, statustext.text, sizeof(text_with_null) - 1); + MAV_SEVERITY severity = static_cast(statustext.severity); if (statustext.id > 0) { if (statustext.id != _last_id) { _temp_multi_str = ""; _last_chunk_seq = 0; _last_id = statustext.id; - _last_severity = static_cast(statustext.severity); } // We can recover from missing chunks in-between but not if the first or last one is lost. @@ -30,11 +30,11 @@ MavlinkStatustextHandler::process(const mavlink_statustext_t& statustext) // No zero termination yet, keep going. return std::nullopt; } else { - return Statustext{_temp_multi_str, _last_severity}; + return Statustext{_temp_multi_str, severity}; } } - return Statustext{text_with_null, _last_severity}; + return Statustext{text_with_null, severity}; } std::string MavlinkStatustextHandler::severity_str(MAV_SEVERITY severity) diff --git a/src/core/mavlink_statustext_handler.h b/src/core/mavlink_statustext_handler.h index 52e4e861b6..ac28ab4788 100644 --- a/src/core/mavlink_statustext_handler.h +++ b/src/core/mavlink_statustext_handler.h @@ -24,7 +24,6 @@ class MavlinkStatustextHandler { std::string _temp_multi_str{}; uint16_t _last_id{0}; uint8_t _last_chunk_seq{0}; - MAV_SEVERITY _last_severity{MAV_SEVERITY_DEBUG}; }; } // namespace mavsdk