[CONF] Remove iniparser's duplicated loads & error messages

This commit removes iniparser's duplicated loads and error messages.
The origianl codes used to call load_conf() multiple times, generating
meaningless error messages.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/src/core/ne-conf.c b/src/core/ne-conf.c
index 7c46669..5fbe699 100644 (file)
--- a/src/core/ne-conf.c
+++ b/src/core/ne-conf.c
@@ -144,24 +144,13 @@ int load_conf(const char *inipath)
   load_conf_default();
 
   /* Load up config from ini if available */
-
-  if (inipath) {
-    ini = iniparser_load(inipath);
-    if (ini == NULL)
-      fprintf(stderr, "Cannot load .ini file (%s)\n", inipath);
-  } else {
-    ini = iniparser_load(default_ini_path);
-    if (ini == NULL)
-      fprintf(stderr, "Cannot load .ini file (%s)\n", default_ini_path);
-  }
-
+  ini = iniparser_load(inipath != NULL ? inipath : default_ini_path);
   if (ini) {
     load_conf_ini(ini, &config);
     iniparser_freedict(ini);
   }
 
   /* Load up config from envvar if available */
-
   load_conf_envvar(&config);
 
   return 0;

diff --git a/src/core/npu/NPUdrvAPI.c b/src/core/npu/NPUdrvAPI.c
index f8db2de..2e92446 100644 (file)
--- a/src/core/npu/NPUdrvAPI.c
+++ b/src/core/npu/NPUdrvAPI.c
@@ -93,8 +93,6 @@ void init_npu_api(void)
 {
   int i;
 
-  load_conf(NULL);
-
   pthread_mutex_init(&napi_priv.mutex, NULL);
   for (i=0; i<MAX_NUM_DEVICE; i++) {
     napi_priv.npu_fd_table[i] = NULL;

diff --git a/src/test/unittests/ne_core_comm_ip_test.cpp b/src/test/unittests/ne_core_comm_ip_test.cpp
index 1601910..f6a9362 100644 (file)
--- a/src/test/unittests/ne_core_comm_ip_test.cpp
+++ b/src/test/unittests/ne_core_comm_ip_test.cpp
@@ -293,11 +293,7 @@ TEST (ne_core_ip_test_default_conf, registerNPUmodel_large_size)
 int
 main (int argc, char **argv)
 {
-  int ret = 0;
-
   testing::InitGoogleTest (&argc, argv);
 
-  ret = RUN_ALL_TESTS();
-
-  return ret;
+  return RUN_ALL_TESTS();
 }

diff --git a/src/test/unittests/ne_core_gem_test.cpp b/src/test/unittests/ne_core_gem_test.cpp
index e908c5d..592c7e4 100644 (file)
--- a/src/test/unittests/ne_core_gem_test.cpp
+++ b/src/test/unittests/ne_core_gem_test.cpp
@@ -205,8 +205,7 @@ TEST (ne_core_gem_test, self_import_dmabuf)
 int
 main (int argc, char **argv)
 {
-  /** NULL is OK because it will load load_conf_default */
-  load_conf (argv[1]);
+  load_conf (NULL);
 
   testing::InitGoogleTest (&argc, argv);
 

diff --git a/src/test/unittests/ne_core_handler_test.cpp b/src/test/unittests/ne_core_handler_test.cpp
index 9e0b144..4b9392e 100644 (file)
--- a/src/test/unittests/ne_core_handler_test.cpp
+++ b/src/test/unittests/ne_core_handler_test.cpp
@@ -200,13 +200,9 @@ TEST (ne_core_handler_test, start_stop_operation)
 int
 main (int argc, char **argv)
 {
-  int ret = 0;
-
-  load_conf (argv[1]);
+  load_conf (NULL);
 
   testing::InitGoogleTest (&argc, argv);
 
-  ret = RUN_ALL_TESTS();
-
-  return ret;
+  return RUN_ALL_TESTS();
 }

diff --git a/src/test/unittests/ne_core_inf_test.cpp b/src/test/unittests/ne_core_inf_test.cpp
index 016201e..24e7647 100644 (file)
--- a/src/test/unittests/ne_core_inf_test.cpp
+++ b/src/test/unittests/ne_core_inf_test.cpp
@@ -293,13 +293,7 @@ TEST (ne_core_inf_test, multiple_inputs)
 int
 main (int argc, char **argv)
 {
-  int ret = 0;
-
-  load_conf (argv[1]);
-
   testing::InitGoogleTest (&argc, argv);
 
-  ret = RUN_ALL_TESTS();
-
-  return ret;
+  return RUN_ALL_TESTS();
 }

diff --git a/src/test/unittests/ne_core_mem_test.cpp b/src/test/unittests/ne_core_mem_test.cpp
index 16b85a9..443b26c 100644 (file)
--- a/src/test/unittests/ne_core_mem_test.cpp
+++ b/src/test/unittests/ne_core_mem_test.cpp
@@ -621,8 +621,6 @@ TEST (ne_core_mem_test, get_next_buffer_modes)
 int
 main (int argc, char **argv)
 {
-  load_conf (argv[1]);
-
   testing::InitGoogleTest (&argc, argv);
 
   return RUN_ALL_TESTS();

diff --git a/src/test/unittests/ne_core_npu_test.cpp b/src/test/unittests/ne_core_npu_test.cpp
index 91cc14d..560bf4f 100644 (file)
--- a/src/test/unittests/ne_core_npu_test.cpp
+++ b/src/test/unittests/ne_core_npu_test.cpp
@@ -253,7 +253,7 @@ TEST (ne_core_npu_test, check_dev_status)
 int
 main (int argc, char **argv)
 {
-  load_conf (argv[1]);
+  load_conf (NULL);
 
   testing::InitGoogleTest (&argc, argv);
 

diff --git a/src/test/unittests/ne_core_tlb_test.cpp b/src/test/unittests/ne_core_tlb_test.cpp
index d258a46..2608c7f 100644 (file)
--- a/src/test/unittests/ne_core_tlb_test.cpp
+++ b/src/test/unittests/ne_core_tlb_test.cpp
@@ -225,7 +225,7 @@ TEST (ne_core_tlb_test, dev_operate_02_n)
 int
 main (int argc, char **argv)
 {
-  load_conf (argv[1]);
+  load_conf (NULL);
 
   testing::InitGoogleTest (&argc, argv);