From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 24 Apr 2017 07:23:17 +0000 (+0200)
Subject: Fix: Avoid returning 2 results for 1 signal.
X-Git-Tag: 3.99.1~139
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=9e72f805168ae60919117c98dc1ab6c7441873ac;p=apps%2Flow-level-can-service.git

Fix: Avoid returning 2 results for 1 signal.

Either returning signal with search against generic_name either against name,
not both.

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

diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp
index d2e9205..2eae7e9 100644
--- a/CAN-binder/low-can-binding/utils/signals.hpp
+++ b/CAN-binder/low-can-binding/utils/signals.hpp
@@ -61,7 +61,7 @@ namespace utils
 			{
 				if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0)
 					found_signals.push_back(&s);
-				if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
+				else if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
 					found_signals.push_back(&s);
 			}
 		}