From e78758eab6b6582af0d1a86f3a56012499fb2308 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 22 May 2017 10:28:38 +0200 Subject: Logical bus name mapped to device name using conf file. Store CAN device map without prefixed section name and add methods to get the mapped device name. Change-Id: I03ebc175c67b2251016863b0d69a45a816a81d25 Signed-off-by: Romain Forlot --- CAN-binder/libs/ini-config/ini-config.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'CAN-binder/libs/ini-config/ini-config.cpp') diff --git a/CAN-binder/libs/ini-config/ini-config.cpp b/CAN-binder/libs/ini-config/ini-config.cpp index 631a0201..ef3ab25c 100644 --- a/CAN-binder/libs/ini-config/ini-config.cpp +++ b/CAN-binder/libs/ini-config/ini-config.cpp @@ -58,9 +58,10 @@ void ini_config::read_file(const std::string& filename) } } -std::map ini_config::get_keys(const std::string& section) +ini_config::map ini_config::get_keys(const std::string& section, bool wo_prefix) { - std::map ret; + map ret; + std::string key; std::string prefix = section + '/'; for(auto i = config_.begin(); @@ -69,7 +70,11 @@ std::map ini_config::get_keys(const std::string& secti { if (starts_with(i->first, prefix)) { - ret[i->first] = i->second; + if(wo_prefix) + key = i->first.substr(section.size()+1); + else + key = i->first; + ret[key] = i->second; } } return ret; -- cgit 1.2.3-korg