From 2802662225dc95abfcde67d7678da64cf82379cd Mon Sep 17 00:00:00 2001
From: kongr45gpen <electrovesta@gmail.com>
Date: Fri, 5 Apr 2019 03:13:09 +0300
Subject: [PATCH] Fix the build on clang-tidy
---
src/Message.cpp | 2 +-
src/Services/TimeBasedSchedulingService.cpp | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Message.cpp b/src/Message.cpp
index 6a79a08f..a969e6ff 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -82,7 +82,7 @@ uint16_t Message::readBits(uint8_t numBits) {
ASSERT_REQUEST(readPosition < ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
if ((currentBit + numBits) >= 8) {
- uint8_t bitsToAddNow = static_cast<uint8_t>(8 - currentBit);
+ auto bitsToAddNow = static_cast<uint8_t>(8 - currentBit);
uint8_t mask = ((1u << bitsToAddNow) - 1u);
uint8_t maskedData = data[readPosition] & mask;
diff --git a/src/Services/TimeBasedSchedulingService.cpp b/src/Services/TimeBasedSchedulingService.cpp
index 5bb48add..f8f0259a 100644
--- a/src/Services/TimeBasedSchedulingService.cpp
+++ b/src/Services/TimeBasedSchedulingService.cpp
@@ -37,12 +37,12 @@ void TimeBasedSchedulingService::insertActivities(Message& request) {
// todo: Get the sub-schedule ID if they are implemented
uint16_t iterationCount = request.readUint16(); // Get the iteration count, (N)
- while (iterationCount--) {
+ while (iterationCount-- != 0) {
// todo: Get the group ID first, if groups are used
uint32_t currentTime = TimeGetter::getSeconds(); // Get the current system time
uint32_t releaseTime = request.readUint32(); // Get the specified release time
- if ((not scheduledActivities.available()) || (releaseTime < (currentTime + ECSS_TIME_MARGIN_FOR_ACTIVATION))) {
+ if ((scheduledActivities.available() == 0) || (releaseTime < (currentTime + ECSS_TIME_MARGIN_FOR_ACTIVATION))) {
ErrorHandler::reportError(request, ErrorHandler::InstructionExecutionStartError);
request.skipBytes(ECSS_TC_REQUEST_STRING_SIZE);
} else {
@@ -100,7 +100,7 @@ void TimeBasedSchedulingService::timeShiftActivitiesByID(Message& request) {
int32_t relativeOffset = request.readSint32(); // Get the offset first
uint16_t iterationCount = request.readUint16(); // Get the iteration count, (N)
- while (iterationCount--) {
+ while (iterationCount-- != 0) {
// Parse the request ID
RequestID receivedRequestID; // Save the received request ID
receivedRequestID.sourceID = request.readUint8(); // Get the source ID
@@ -134,7 +134,7 @@ void TimeBasedSchedulingService::deleteActivitiesByID(Message& request) {
assert(request.messageType == 5);
uint16_t iterationCount = request.readUint16(); // Get the iteration count, (N)
- while (iterationCount--) {
+ while (iterationCount-- != 0) {
// Parse the request ID
RequestID receivedRequestID; // Save the received request ID
receivedRequestID.sourceID = request.readUint8(); // Get the source ID
@@ -183,7 +183,7 @@ void TimeBasedSchedulingService::detailReportActivitiesByID(Message& request) {
etl::list<ScheduledActivity, ECSS_MAX_NUMBER_OF_TIME_SCHED_ACTIVITIES> matchedActivities;
uint16_t iterationCount = request.readUint16(); // Get the iteration count, (N)
- while (iterationCount--) {
+ while (iterationCount-- != 0) {
// Parse the request ID
RequestID receivedRequestID; // Save the received request ID
receivedRequestID.sourceID = request.readUint8(); // Get the source ID
@@ -224,7 +224,7 @@ void TimeBasedSchedulingService::summaryReportActivitiesByID(Message& request) {
etl::list<ScheduledActivity, ECSS_MAX_NUMBER_OF_TIME_SCHED_ACTIVITIES> matchedActivities;
uint16_t iterationCount = request.readUint16(); // Get the iteration count, (N)
- while (iterationCount--) {
+ while (iterationCount-- != 0) {
// Parse the request ID
RequestID receivedRequestID; // Save the received request ID
receivedRequestID.sourceID = request.readUint8(); // Get the source ID
--
GitLab