From 528d41049be287fdd273185ab74a8bb2c8d63f5f Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 10 Dec 2019 19:02:36 +0100 Subject: low-can-cb: Little opti Change-Id: I6f3e84700563fc60e643d770365c98342214bedd Signed-off-by: Romain Forlot --- low-can-binding/binding/low-can-cb.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp index 1ebb392a..0bee7ef4 100644 --- a/low-can-binding/binding/low-can-cb.cpp +++ b/low-can-binding/binding/low-can-cb.cpp @@ -394,11 +394,9 @@ static int process_one_subscribe_args(afb_req_t request, bool subscribe, json_ob // 2 cases : ID(PGN) and event json_object_object_get_ex(args,"event",&event); - json_bool test_id = json_object_object_get_ex(args,"id",&id); - if(!test_id) - test_id = json_object_object_get_ex(args,"pgn",&id); + json_object_object_get_ex(args,"id",&id) || json_object_object_get_ex(args,"pgn",&id); - if( args == NULL || (id && ((std::string)json_object_get_string(id)).compare("*") == 0)) + if( args == NULL || (id && ((std::string)json_object_get_string(id)).compare("*") == 0)) { rc = one_subscribe_unsubscribe_events(request, subscribe, "*", args); } -- cgit 1.2.3-korg