From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 10 Jul 2017 17:02:37 +0000 (+0200)
Subject: Different errors between no file and wrong content
X-Git-Tag: 4.0.0~27
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=e75bc1833664ec34852d38a46e133334c19ac58c;p=apps%2Flow-level-can-service.git

Different errors between no file and wrong content

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

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index 1b0e186..71e7849 100644
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -295,12 +295,15 @@ void can_bus_t::push_new_vehicle_message(int subscription_id, const openxc_Vehic
 /// mapping configuration file read at initialization.
 void can_bus_t::set_can_devices()
 {
-	can_devices_ = conf_file_.get_devices_name();
-
-	if(can_devices_.empty())
+	if(conf_file_.check_conf())
 	{
-		AFB_ERROR("No mapping found in config file: '%s'. Check it that it have a CANbus-mapping section.",
-			conf_file_.filepath().c_str());
+		can_devices_ = conf_file_.get_devices_name();
+
+		if(can_devices_.empty())
+		{
+			AFB_ERROR("No mapping found in config file: '%s'. Check it that it have a CANbus-mapping section.",
+				conf_file_.filepath().c_str());
+		}
 	}
 }