aboutsummaryrefslogtreecommitdiffstats
path: root/src/app.cpp
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2018-05-10 14:44:21 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2018-05-10 14:44:21 +0900
commit6ecd550833c47819bf0df7dc9df848dea67f2b28 (patch)
tree18350e61e8bbe389c9e6864ce0d88d7a2299a30c /src/app.cpp
parent2ea71aa957634ce69681ae34abace0566d52b744 (diff)
Replace json_object_from_file to inputJsonFilie
and remove unnecessary header Change-Id: Ia4200a9742d62933328d0518731710413caa1a5c Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'src/app.cpp')
-rw-r--r--src/app.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app.cpp b/src/app.cpp
index 777a07f..bfd6c06 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -1069,9 +1069,9 @@ int App::loadAppDb() {
}
// Load app.db
- HMI_DEBUG("wm", "file_name:%s", file_name.c_str());
- json_object* json_obj = json_object_from_file(file_name.c_str());
- if (nullptr == json_obj) {
+ json_object* json_obj;
+ int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
+ if (0 > ret) {
HMI_ERROR("wm", "Could not open app.db, so use default role information");
json_obj = json_tokener_parse(kDefaultAppDb);
}