all: Format one line 'if' or 'for' statement.

[apps/agl-service-can-low-level.git] / low-can-binding / diagnostic / diagnostic-manager.cpp

diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp
index ad1f3a7..91dba47 100644 (file)
--- a/low-can-binding/diagnostic/diagnostic-manager.cpp
+++ b/low-can-binding/diagnostic/diagnostic-manager.cpp
@@ -256,7 +256,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(Diagno
                if(entry != nullptr)
                {
                        if(diagnostic_request_equals(&entry->get_handle()->request, &request))
-                               {return entry;}
+                               return entry;
                }
        }
        return nullptr;
@@ -390,7 +390,7 @@ active_diagnostic_request_t* diagnostic_manager_t::add_recurring_request(Diagnos
                }
        }
        else
-               { AFB_DEBUG("Can't add request, one already exists with same key");}
+                AFB_DEBUG("Can't add request, one already exists with same key");
        return entry;
 }
 
@@ -409,9 +409,7 @@ openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_response(active_dia
        found_signals = utils::signals_manager_t::instance().find_signals(build_DynamicField((double) adr->get_pid()));
 
        if(adr->get_decoder() != nullptr)
-       {
                value = adr->get_decoder()(&response, value);
-       }
 
        if((response.success && adr->get_name().size()) > 0)
        {
@@ -440,9 +438,7 @@ openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_response(active_dia
        }
 
        if(adr->get_callback() != nullptr)
-       {
                adr->get_callback()(adr, &response, value);
-       }
 
        // Reset the completed flag handle to make sure that it will be reprocessed the next time.
        adr->get_handle()->success = false;
@@ -526,7 +522,7 @@ openxc_VehicleMessage diagnostic_manager_t::find_and_decode_adr(std::shared_ptr<
 /// @return True if the active diagnostic request match the response.
 bool diagnostic_manager_t::is_diagnostic_response(std::shared_ptr<message_t> m)
 {
-       if(m->get_msg_format() == message_format_t::STANDARD || m->get_msg_format() == message_format_t::EXTENDED)
+       if(m->get_id() & CAN_SFF_MASK || m->get_id() & CAN_EFF_MASK)
        {
                if (m->get_id() >= 0x7e8 && m->get_id() <= 0x7ef)
                                return true;