This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/export_headers in repository https://gitbox.apache.org/repos/asf/celix.git
commit eed9d3e495fba1e81c67719972ab01aa19f68fed Merge: dba2213a 698ba086 Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Apr 17 20:19:51 2023 +0200 Merge branch 'master' into feature/export_headers # Conflicts: # libs/framework/include/celix_bundle_context.h # libs/framework/include/celix_framework.h libs/framework/gtest/CMakeLists.txt | 8 +- ...s.cpp => CelixBundleContextBundlesTestSuite.cc} | 88 +++++++++-------- ....cpp => CelixBundleContextServicesTestSuite.cc} | 106 ++++++++++----------- ...amework_test.cpp => CelixFrameworkTestSuite.cc} | 37 +++++++ .../gtest/src/CelixFrameworkUtilsTestSuite.cc | 12 +-- .../gtest/src/MultipleFrameworkTestSuite.cc | 56 +++++++++++ .../gtest/src/multiple_frameworks_test.cpp | 103 -------------------- libs/framework/include/celix_bundle_context.h | 18 ++-- libs/framework/include/celix_framework.h | 9 +- libs/framework/src/bundle_context.c | 10 +- libs/framework/src/framework.c | 14 ++- 11 files changed, 231 insertions(+), 230 deletions(-) diff --cc libs/framework/include/celix_bundle_context.h index f5de9c38,8739dd0a..8b1ef2bc --- a/libs/framework/include/celix_bundle_context.h +++ b/libs/framework/include/celix_bundle_context.h @@@ -1144,12 -1152,12 +1144,12 @@@ CELIX_FRAMEWORK_EXPORT bool celix_bundl * @param callbackHandle The data pointer, which will be used in the callbacks * @param use The callback which will be called for the currently started bundles. * The bundle pointers are only guaranteed to be valid during the callback. + * @return The number of times the use callback is called (nr of installed bundles). */ - CELIX_FRAMEWORK_EXPORT void celix_bundleContext_useBundles( -size_t celix_bundleContext_useBundles( ++CELIX_FRAMEWORK_EXPORT size_t celix_bundleContext_useBundles( celix_bundle_context_t *ctx, void *callbackHandle, - void (*use)(void *handle, const celix_bundle_t *bundle) - ); + void (*use)(void *handle, const celix_bundle_t *bundle)); /** * @brief Service Tracker Info provided to the service tracker tracker callbacks. diff --cc libs/framework/include/celix_framework.h index c2eb5290,9703190d..e5beb0d2 --- a/libs/framework/include/celix_framework.h +++ b/libs/framework/include/celix_framework.h @@@ -71,19 -70,20 +71,20 @@@ CELIX_FRAMEWORK_EXPORT celix_bundle_con * @param fw The framework * @return A pointer to the bundle of the framework or NULL if something went wrong. */ -celix_bundle_t* celix_framework_getFrameworkBundle(const celix_framework_t *fw); +CELIX_FRAMEWORK_EXPORT celix_bundle_t* celix_framework_getFrameworkBundle(const celix_framework_t *fw); /** - * @brief Use the currently active (started) bundles. - * The provided callback will be called for all the currently started bundles. + * @brief * @brief Use the currently installed bundles. + * The provided callback will be called for all the currently installed bundles. * * @param ctx The bundle context. * @param includeFrameworkBundle If true the callback will also be triggered for the framework bundle. * @param callbackHandle The data pointer, which will be used in the callbacks - * @param use The callback which will be called for the currently started bundles. + * @param use The callback which will be called for the currently installed bundles. * The bundle pointers are only guaranteed to be valid during the callback. + * @return The number of times the use callback is called. */ - CELIX_FRAMEWORK_EXPORT void celix_framework_useBundles(celix_framework_t *fw, bool includeFrameworkBundle, void *callbackHandle, void(*use)(void *handle, const celix_bundle_t *bnd)); -size_t celix_framework_useBundles(celix_framework_t *fw, bool includeFrameworkBundle, void *callbackHandle, void(*use)(void *handle, const celix_bundle_t *bnd)); ++CELIX_FRAMEWORK_EXPORT size_t celix_framework_useBundles(celix_framework_t *fw, bool includeFrameworkBundle, void *callbackHandle, void(*use)(void *handle, const celix_bundle_t *bnd)); /** * @brief Use the bundle with the provided bundle id
