From 9b4a1fff7be390d31711ab607c0c1b017f297d45 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 11 Dec 2020 10:33:00 -0500 Subject: [PATCH] clang warnings again #2055 --- firmware/controllers/algo/nmea.c | 10 +++++----- firmware/controllers/global_shared.h | 1 - firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/global.h | 2 +- unit_tests/engine_test_helper.cpp | 2 +- unit_tests/mocks.h | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/firmware/controllers/algo/nmea.c b/firmware/controllers/algo/nmea.c index bb3fc9f02d..e9086216e3 100644 --- a/firmware/controllers/algo/nmea.c +++ b/firmware/controllers/algo/nmea.c @@ -23,7 +23,7 @@ #include #include "nmea.h" -long hex2int(char *a, int len) { +static long hex2int(char *a, int len) { int i; long val = 0; @@ -35,7 +35,7 @@ long hex2int(char *a, int len) { return val; } -int str2int(char *a, int len) { +static int str2int(char *a, int len) { int i = 0, k = 0; while (i GPS_MAX_STRING) diff --git a/firmware/controllers/global_shared.h b/firmware/controllers/global_shared.h index 1ccd6d5990..39e1a7a241 100644 --- a/firmware/controllers/global_shared.h +++ b/firmware/controllers/global_shared.h @@ -77,7 +77,6 @@ /* * Stack debugging - * See also getMaxUsedStack() */ EXTERNC int getRemainingStack(thread_t *otp); int CountFreeStackSpace(const void* wabase); diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 6d083e7855..b3dfcf5c3f 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -568,7 +568,7 @@ void exportAllTriggers() { fprintf(fp, "# duty %.2f %.2f\n", shape->expectedDutyCycle[0], shape->expectedDutyCycle[1]); - for (int i = 0; i < shape->getLength(); i++) { + for (size_t i = 0; i < shape->getLength(); i++) { int triggerDefinitionCoordinate = (shape->getTriggerWaveformSynchPointIndex() + i) % shape->getSize(); diff --git a/firmware/global.h b/firmware/global.h index f372d56f4d..525cc852d3 100644 --- a/firmware/global.h +++ b/firmware/global.h @@ -50,7 +50,7 @@ typedef unsigned int time_t; * project-wide default thread stack size * See also PORT_INT_REQUIRED_STACK * See getRemainingStack() - * See getMaxUsedStack() and CountFreeStackSpace() + * See CountFreeStackSpace() * See "threadsinfo" command cmd_threads */ #ifndef UTILITY_THREAD_STACK_SIZE diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 70760c718d..308b7bd019 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -42,7 +42,7 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb Sensor::setMockValue(SensorType::Clt, 70); Sensor::setMockValue(SensorType::Iat, 30); - for (const auto [s, v] : sensorValues) { + for (const auto& [s, v] : sensorValues) { Sensor::setMockValue(s, v); } diff --git a/unit_tests/mocks.h b/unit_tests/mocks.h index 4585b02223..0d9dcd19ea 100644 --- a/unit_tests/mocks.h +++ b/unit_tests/mocks.h @@ -11,7 +11,7 @@ class MockEtb : public IEtbController { public: // IEtbController mocks - MOCK_METHOD(void, reset, (), ()); + MOCK_METHOD(void, reset, (), (override)); MOCK_METHOD(void, update, (), (override)); MOCK_METHOD(bool, init, (etb_function_e function, DcMotor* motor, pid_s* pidParameters, const ValueProvider3D* pedalMap, bool initializeThrottles), (override)); MOCK_METHOD(void, setIdlePosition, (percent_t pos), (override));