From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 20 Nov 2019 18:46:11 +0000 (+0100)
Subject: low-can-cb: improve readability
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=7b7d5f70a5957c5d9c18342adb66e6d300b70894;p=apps%2Fagl-service-can-low-level.git

low-can-cb: improve readability

Just make thing more readable by define variables at the beginning of
functions. And directly assign them if possible.
Also improve format using the same format than in the rest of the project.

Change-Id: I5cc7685b80734d0eb43a29fc06b2a8434f3469fa
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 7182dbfc..7b9b60ec 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -52,20 +52,16 @@
 int config_low_can(afb_api_t apiHandle, CtlSectionT *section, json_object *json_obj)
 {
 	AFB_DEBUG("Config %s", json_object_to_json_string(json_obj));
-	CtlConfigT *ctrlConfig;
-
-	ctrlConfig = (CtlConfigT *) afb_api_get_userdata(apiHandle);
-	if(! ctrlConfig)
-		return -1;
+	CtlConfigT *ctrlConfig = (CtlConfigT *) afb_api_get_userdata(apiHandle);
+	int active_message_set = 0;
+	json_object *dev_mapping = nullptr;
+	const char *diagnotic_bus = nullptr;
 
-	if(! ctrlConfig->external)
+	if(! ctrlConfig || ! ctrlConfig->external)
 		return -1;
 
 	application_t *application = (application_t*) ctrlConfig->external;
 
-	int active_message_set;
-	const char *diagnotic_bus = nullptr;
-
 	if(wrap_json_unpack(json_obj, "{si, ss}",
 			      "active_message_set", &active_message_set,
 			      "diagnostic_bus", &diagnotic_bus))
@@ -194,7 +190,7 @@ static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request,
 		event_filter.frequency = event_filter.frequency == 0 ? sig->get_frequency() : event_filter.frequency;
 		std::shared_ptr<low_can_subscription_t> can_subscription;
 
-		auto it =  std::find_if(s.begin(), s.end(), [&sig](std::pair<int, std::shared_ptr<low_can_subscription_t> > sub)
+		auto it = std::find_if(s.begin(), s.end(), [&sig](std::pair<int, std::shared_ptr<low_can_subscription_t> > sub)
 		{
 			return (! sub.second->get_diagnostic_message().empty());
 		});