This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/deprecated_framework_header_without_celix_prefix in repository https://gitbox.apache.org/repos/asf/celix.git
commit 34dbb948e221aa0568d3ca270ea3beec6783226d Merge: 49761c05 29a00955 Author: Pepijn Noltes <[email protected]> AuthorDate: Thu Apr 6 17:57:46 2023 +0200 Merge branch 'master' into feature/deprecated_framework_header_without_celix_prefix bundles/shell/shell/src/lb_command.c | 48 +++--- libs/error_injector/CMakeLists.txt | 2 + libs/error_injector/asprintf/src/asprintf_ei.cc | 5 +- .../error_injector/{stdio => dlfcn}/CMakeLists.txt | 16 +- .../stdio_ei.h => dlfcn/include/dlfcn_ei.h} | 12 +- .../src/asprintf_ei.cc => dlfcn/src/dlfcn_ei.cc} | 27 ++-- libs/error_injector/{stdio => fts}/CMakeLists.txt | 16 +- .../include/stdio_ei.h => fts/include/fts_ei.h} | 12 +- .../{stdio/src/stdio_ei.cc => fts/src/fts_ei.cc} | 29 ++-- libs/error_injector/stdio/CMakeLists.txt | 1 + libs/error_injector/stdio/include/stdio_ei.h | 2 + libs/error_injector/stdio/src/stdio_ei.cc | 10 ++ libs/framework/gtest/CMakeLists.txt | 5 +- .../CelixFrameworkUtilsErrorInjectionTestSuite.cc | 53 ++++++- .../gtest/src/CelixFrameworkUtilsTestSuite.cc | 6 + libs/framework/include/celix/Bundle.h | 68 ++++----- libs/framework/include/celix/BundleContext.h | 24 +-- libs/framework/include/celix/Exception.h | 2 +- libs/framework/include/celix/Framework.h | 6 +- libs/framework/include/celix/FrameworkUtils.h | 4 +- libs/framework/include/celix_bundle.h | 5 +- libs/framework/include_deprecated/bundle_archive.h | 16 +- libs/framework/src/bundle.c | 6 +- libs/framework/src/bundle_archive.c | 10 ++ libs/framework/src/bundle_archive_private.h | 1 - libs/framework/src/celix_framework_utils.c | 161 +++++++++++---------- libs/utils/gtest/CMakeLists.txt | 2 +- .../gtest/src/FileUtilsErrorInjectionTestSuite.cc | 58 +++++++- libs/utils/gtest/src/FileUtilsTestSuite.cc | 33 +++++ libs/utils/include/celix/Filter.h | 20 +-- libs/utils/include/celix/Properties.h | 34 ++--- libs/utils/src/celix_file_utils.c | 55 ++++--- 32 files changed, 474 insertions(+), 275 deletions(-)
