From fae627b646e9ab709adbd0c60d7582176375e0c3 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 20 Nov 2019 19:46:11 +0100 Subject: [PATCH] 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. Bug-AGL: SPEC-2932 Change-Id: I5cc7685b80734d0eb43a29fc06b2a8434f3469fa Signed-off-by: Romain Forlot --- low-can-binding/binding/low-can-cb.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp index 3037994a..20ed39d4 100644 --- a/low-can-binding/binding/low-can-cb.cpp +++ b/low-can-binding/binding/low-can-cb.cpp @@ -53,21 +53,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; - json_object *dev_mapping = nullptr; - const char *diagnotic_bus = nullptr; - if(wrap_json_unpack(json_obj, "{si, ss}", "active_message_set", &active_message_set, "diagnostic_bus", &diagnotic_bus)) @@ -196,7 +191,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 can_subscription; - auto it = std::find_if(s.begin(), s.end(), [&sig](std::pair > sub) + auto it = std::find_if(s.begin(), s.end(), [&sig](std::pair > sub) { return (! sub.second->get_diagnostic_message().empty()); }); -- 2.16.6