X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-cb.cpp;h=0bee7ef4b2db730f02eff416fc4405d440c6a123;hb=refs%2Fchanges%2F79%2F23379%2F3;hp=1ebb392ab742c6e928ec4e28c100846db5689259;hpb=3c7fa35fe09693f367ee9b159723435007ebfa07;p=apps%2Fagl-service-can-low-level.git

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);
 	}