[celix] branch feature/refactor_bundle_cache updated: Remove possible dead code in framework_logIfError

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/refactor_bundle_cache
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/refactor_bundle_cache 
by this push:
     new 77e5ab55 Remove possible dead code in framework_logIfError
77e5ab55 is described below

commit 77e5ab558cc81ac4b4573b5ea47ed744a3532657
Author: PengZheng <howto...@gmail.com>
AuthorDate: Mon Mar 13 21:57:38 2023 +0800

    Remove possible dead code in framework_logIfError
---
 .../remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt        | 3 +++
 bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt     | 2 +-
 libs/framework/include/celix_log.h                                  | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt
 
b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt
index e499fb0f..ecfc2644 100644
--- 
a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt
+++ 
b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt
@@ -51,5 +51,8 @@ celix_get_bundle_file(Celix::rsa_discovery 
RSA_DISCOVERY_BUNDLE_FILE)
 configure_file(resources/client.properties.in client.properties)
 configure_file(resources/server.properties.in server.properties)
 
+
+add_celix_bundle_dependencies(test_rsa_shm Celix::rsa_shm Celix::rsa_json_rpc 
calculator_shell calculator)
+
 add_test(NAME run_test_rsa_shm COMMAND test_rsa_shm)
 setup_target_for_coverage(test_rsa_shm SCAN_DIR ..)
diff --git a/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt 
b/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
index e31940d0..347daab1 100644
--- a/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
+++ b/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
@@ -42,7 +42,7 @@ target_link_libraries(test_tm_scoped PRIVATE
         Celix::rsa_common
 )
 
-add_celix_bundle_dependencies(test_tm_scoped Celix::rsa_dfi 
Celix::rsa_topology_manager)
+add_celix_bundle_dependencies(test_tm_scoped Celix::rsa_dfi 
Celix::rsa_topology_manager calculator topology_manager_disc_mock_bundle 
topology_manager_test_bundle)
 
 file(GENERATE 
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/config.properties"
diff --git a/libs/framework/include/celix_log.h 
b/libs/framework/include/celix_log.h
index 66189692..80b2fb6b 100644
--- a/libs/framework/include/celix_log.h
+++ b/libs/framework/include/celix_log.h
@@ -39,11 +39,7 @@ typedef struct celix_framework_logger 
celix_framework_logger_t; //opaque
 
 #define framework_logIfError(logger, status, error, fmsg, args...) \
     if (status != CELIX_SUCCESS) { \
-        if (error != NULL) { \
-            fw_logCode(logger, CELIX_LOG_LEVEL_ERROR, status, #fmsg";\n Cause: 
%s", ## args, (char*) error); \
-        } else { \
-            fw_logCode(logger, CELIX_LOG_LEVEL_ERROR, status, #fmsg, ## args); 
\
-        } \
+        fw_logCode(logger, CELIX_LOG_LEVEL_ERROR, status, #fmsg";\n Cause: 
%s", ## args, (const char*) (error ? error : "")); \
     }