3 files changed, 5 insertions, 60 deletions

diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp
index c5dfa1b6..4c9641c4 100644
--- a/low-can-binding/binding/application.cpp
+++ b/low-can-binding/binding/application.cpp
@@ -154,13 +154,9 @@ bool application_t::is_engine_on()
 
 		if(sf.signals.front()->get_last_value_with_timestamp().first > 0 &&
 		   std::difftime(std::time(nullptr), last_timestamp_in_s) < ENGINE_VALUE_TIMEOUT)
-		{
 			engine_on = true;
-		}
 		else
-		{
 			AFB_NOTICE("is_engine_on: engine.speed CAN signal found, but engine seems off");
-		}
 	}
 	else
 	{
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 5d5a5170..4be7261e 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -126,9 +126,7 @@ static int subscribe_unsubscribe_signal(afb_req_t request,
 		 * subsciptions.
 		 */
 		if(! request)
-		{
 			return 0;
-		}
 
 		// Event doesn't exist , so let's create it
 		if ((ret = can_subscription->subscribe(request)) < 0)
@@ -485,35 +483,6 @@ void unsubscribe(afb_req_t request)
 	do_subscribe_unsubscribe(request, false);
 }
 
-/*
-static int send_frame(struct canfd_frame& cfd, const std::string& bus_name, socket_type type)
-{
-	if(bus_name.empty())
-	{
-		return -1;
-	}
-
-	std::map<std::string, std::shared_ptr<low_can_subscription_t> >& cd = application_t::instance().get_can_devices();
-
-	if( cd.count(bus_name) == 0)
-	{
-		cd[bus_name] = std::make_shared<low_can_subscription_t>(low_can_subscription_t());
-	}
-
-
-	if(type == socket_type::BCM)
-	{
-		return low_can_subscription_t::tx_send(*cd[bus_name], cfd, bus_name);
-	}
-	else if(type == socket_type::J1939)
-	{
-		return low_can_subscription_t::j1939_send(*cd[bus_name], cfd, bus_name);
-	}
-	else{
-		return -1;
-	}
-}
-*/
 static int send_message(message_t *message, const std::string& bus_name, uint32_t flags, event_filter_t &event_filter, std::shared_ptr<signal_t> signal)
 {
 	if(bus_name.empty())
diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 4bdf3181..6cfcb718 100644
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -102,12 +102,9 @@ int low_can_subscription_t::set_event()
 int low_can_subscription_t::subscribe(afb_req_t request)
 {
 	if(! afb_event_is_valid(event_))
-	{
 		if(set_event() < 0)
-		{
 			return -1;
-		}
-	}
+
 	return afb_req_subscribe(request, event_);
 }
 
@@ -175,12 +172,9 @@ const vect_ptr_diag_msg_t low_can_subscription_t::get_diagnostic_message() const
 const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnostic_message(uint32_t pid) const
 {
 	for(const auto& diag: diagnostic_message_)
-	{
 		if(diag->get_pid() == pid)
-		{
 			return diag;
-		}
-	}
+
 	return nullptr;
 }
 
@@ -190,12 +184,9 @@ const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnost
 const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnostic_message(const std::string& name) const
 {
 	for(const auto& diag: diagnostic_message_)
-	{
 		if(diag->get_name() == name)
-		{
 			return diag;
-		}
-	}
+
 	return nullptr;
 }
 
@@ -421,9 +412,7 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
 			pgn_t pgn = J1939_NO_PGN;
 			std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
 			if(!bus_name.empty())
-			{
 				ret = socket->open(bus_name, pgn);
-			}
 			subscription.socket_ = socket;
 			subscription.index_ = (int)subscription.socket_->socket();
 		}
@@ -628,26 +617,17 @@ int low_can_subscription_t::create_rx_filter_can(low_can_subscription_t &subscri
 int low_can_subscription_t::create_rx_filter(std::shared_ptr<signal_t> sig)
 {
 	if(!sig->get_message()->is_isotp() && !sig->get_message()->is_j1939())
-	{
 		return low_can_subscription_t::create_rx_filter_can(*this, sig);
-	}
 #ifdef USE_FEATURE_ISOTP
 	else if(sig->get_message()->is_isotp())
-	{
 		return low_can_subscription_t::create_rx_filter_isotp(*this, sig);
-	}
 #endif
 #ifdef USE_FEATURE_J1939
 	else if(sig->get_message()->is_j1939())
-	{
 		return low_can_subscription_t::create_rx_filter_j1939(*this, sig);
-	}
 #endif
-	else
-	{
-		AFB_ERROR("Signal can't be j1939 and isotp");
-		return -1;
-	}
+	AFB_ERROR("Signal can't be j1939 and isotp");
+	return -1;
 }