aboutsummaryrefslogtreecommitdiffstats
path: root/CAN-binder/low-can-binding/diagnostic
diff options
context:
space:
mode:
Diffstat (limited to 'CAN-binder/low-can-binding/diagnostic')
-rw-r--r--CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp10
-rw-r--r--CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp2
-rw-r--r--CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp4
-rw-r--r--CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp2
4 files changed, 8 insertions, 10 deletions
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
index 199054b5..4f4b842e 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp
@@ -33,7 +33,7 @@
#define MICRO 1000000
diagnostic_manager_t::diagnostic_manager_t()
- : initialized_{false}
+ : initialized_{false}, event_source_{nullptr}
{}
/// @brief Diagnostic manager isn't initialized at launch but after
@@ -185,6 +185,7 @@ void diagnostic_manager_t::shims_logger(const char* format, ...)
vsnprintf(buffer, 256, format, args);
DEBUG(binder_interface, "%s: %s", __FUNCTION__, buffer);
+ va_end(args);
}
/// @brief The type signature for a... OpenXC TODO: not used yet.
@@ -288,10 +289,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(const
if(entry != nullptr)
{
if(diagnostic_request_equals(&entry->get_handle()->request, request))
- {
- return entry;
- break;
- }
+ {return entry;}
}
}
return nullptr;
@@ -323,7 +321,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(const
/// @return true if the request was added successfully. Returns false if there
/// wasn't a free active request entry, if the frequency was too high or if the
/// CAN acceptance filters could not be configured,
-active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string name,
+active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string& name,
bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder,
const DiagnosticResponseCallback callback)
{
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
index 9f19b016..d942b47b 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -79,7 +79,7 @@ public:
active_diagnostic_request_t* find_recurring_request(const DiagnosticRequest* request);
// Subscription parts
- active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string name,
+ active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name,
bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
const DiagnosticResponseCallback callback);
bool validate_optional_request_attributes(float frequencyHz);
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
index 4455aa89..df093b0b 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp
@@ -34,10 +34,10 @@ const char *UNIT_NAMES[10] = {
"NM"
};
-diagnostic_message_t::diagnostic_message_t(uint8_t pid, const std::string generic_name, const int min,
+diagnostic_message_t::diagnostic_message_t(uint8_t pid, const std::string& generic_name, const int min,
const int max, enum UNIT unit, float frequency, DiagnosticResponseDecoder decoder,
DiagnosticResponseCallback callback, bool supported)
- : pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit},
+ : parent_{nullptr}, pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit},
frequency_{frequency}, decoder_{decoder}, callback_{callback}, supported_{supported}
{}
diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
index ac427b97..65ed9c02 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp
@@ -64,7 +64,7 @@ class diagnostic_message_t
public:
const char* generic_name = generic_name_.c_str();
- diagnostic_message_t(uint8_t pid, const std::string generic_name, const int min, const int max, enum UNIT unit, float frequency,
+ diagnostic_message_t(uint8_t pid, const std::string& generic_name, const int min, const int max, enum UNIT unit, float frequency,
DiagnosticResponseDecoder decoder, DiagnosticResponseCallback callback, bool supported);
uint32_t get_pid();