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

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

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index 48ac697..ddf5491 100644 (file)
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -81,7 +81,7 @@ bool can_bus_t::apply_filter(const openxc_VehicleMessage& vehicle_message, std::
 /// @param[in] can_message - a single CAN message from the CAN socket read, to be decode.
 ///
 /// @return How many signals has been decoded.
-void can_bus_t::process_signals(std::shared_ptr<message_t> message, std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+void can_bus_t::process_signals(std::shared_ptr<message_t> message, map_subscription& s)
 {
        int subscription_id = message->get_sub_id();
        openxc_DynamicField decoded_message;
@@ -114,13 +114,13 @@ void can_bus_t::process_signals(std::shared_ptr<message_t> message, std::map<int
 /// @param[in] can_message - a single CAN message from the CAN socket read, to be decode.
 ///
 /// @return How many signals has been decoded.
-void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, std::shared_ptr<message_t> message, std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, std::shared_ptr<message_t> message, map_subscription& s)
 {
        int subscription_id = message->get_sub_id();
 
        openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(message);
        if (message->get_timestamp())
-               {vehicle_message.timestamp = message->get_timestamp();}
+               vehicle_message.timestamp = message->get_timestamp();
        if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) &&
                s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
        {
@@ -160,13 +160,13 @@ void can_bus_t::can_decode_message()
 
                        {
                                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
-                               std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
+                               map_subscription& s = sm.get_subscribed_signals();
                                if(application_t::instance().get_diagnostic_manager().is_diagnostic_response(message))
                                {
                                        process_diagnostic_signals(application_t::instance().get_diagnostic_manager(), message, s);
                                }
                                else
-                                       {process_signals(message, s);}
+                                       process_signals(message, s);
                        }
                        can_message_lock.lock();
                }
@@ -192,7 +192,7 @@ void can_bus_t::can_event_push()
                        decoded_can_message_lock.unlock();
                        {
                                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
-                               std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
+                               map_subscription& s = sm.get_subscribed_signals();
                                if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
                                {
                                        jo = json_object_new_object();
@@ -200,9 +200,9 @@ void can_bus_t::can_event_push()
                                        if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
                                        {
                                                if(v_message.second.has_diagnostic_response)
-                                                       {on_no_clients(s[v_message.first], v_message.second.diagnostic_response.pid, s);}
+                                                       on_no_clients(s[v_message.first], v_message.second.diagnostic_response.pid, s);
                                                else
-                                                       {on_no_clients(s[v_message.first], s);}
+                                                       on_no_clients(s[v_message.first], s);
                                        }
                                }
                        }