This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/685-remove-bundle-revision in repository https://gitbox.apache.org/repos/asf/celix.git
commit 0ac29020d463d326e3d4db66c912ececae876fa9 Author: Pepijn Noltes <[email protected]> AuthorDate: Sat Jan 4 17:50:50 2025 +0100 gh-685: Cleanup include files for archive, cache and fw_private --- libs/framework/src/celix_bundle_archive.h | 24 +++++++----------------- libs/framework/src/celix_bundle_cache.h | 9 ++------- libs/framework/src/framework_private.h | 2 +- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/libs/framework/src/celix_bundle_archive.h b/libs/framework/src/celix_bundle_archive.h index d226c72e5..40fefb84c 100644 --- a/libs/framework/src/celix_bundle_archive.h +++ b/libs/framework/src/celix_bundle_archive.h @@ -16,24 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -/** - * celix_bundle_archive.h - * - * \date Aug 8, 2010 - * \author <a href="mailto:[email protected]";>Apache Celix Project Team</a> - * \copyright Apache License, Version 2.0 - */ #ifndef BUNDLE_ARCHIVE_H_ #define BUNDLE_ARCHIVE_H_ -#include "celix_types.h" -#include <stdbool.h> -#include <stdlib.h> +#include <time.h> -#include "celix_bundle_state.h" +#include "celix_types.h" #include "celix_errno.h" -#include "celix_framework_export.h" #include "celix_bundle_manifest_type.h" #include "celix_cleanup.h" @@ -53,7 +43,7 @@ extern "C" { #endif - /** +/** * @brief Create bundle archive. * Create a bundle archive for the given root, id, location and revision nr. * Also create the bundle cache dir and if will reuse a existing bundle resource cache dir if the provided @@ -63,10 +53,10 @@ celix_status_t celix_bundleArchive_create(celix_framework_t* fw, const char *arc void celix_bundleArchive_destroy(celix_bundle_archive_t* archive); - /** - * Define the cleanup function for a bundle_archive_t, so that it can be used with celix_autoptr. - */ - CELIX_DEFINE_AUTOPTR_CLEANUP_FUNC(celix_bundle_archive_t, celix_bundleArchive_destroy); +/** +* Define the cleanup function for a bundle_archive_t, so that it can be used with celix_autoptr. +*/ +CELIX_DEFINE_AUTOPTR_CLEANUP_FUNC(celix_bundle_archive_t, celix_bundleArchive_destroy); /** * @brief Returns the bundle id of the bundle archive. diff --git a/libs/framework/src/celix_bundle_cache.h b/libs/framework/src/celix_bundle_cache.h index 997dcf9a6..7a599f309 100644 --- a/libs/framework/src/celix_bundle_cache.h +++ b/libs/framework/src/celix_bundle_cache.h @@ -20,13 +20,8 @@ #ifndef CELIX_BUNDLE_CACHE_H_ #define CELIX_BUNDLE_CACHE_H_ -#include <stdbool.h> - -#include "celix_array_list.h" -#include "celix_framework.h" -#include "celix_long_hash_map.h" - -#include "celix_bundle_archive.h" +#include "celix_types.h" +#include "celix_errno.h" #ifdef __cplusplus extern "C" { diff --git a/libs/framework/src/framework_private.h b/libs/framework/src/framework_private.h index 5f7fcebc8..c199cc254 100644 --- a/libs/framework/src/framework_private.h +++ b/libs/framework/src/framework_private.h @@ -39,7 +39,7 @@ #include "celix_log.h" #include "celix_threads.h" #include "service_registry.h" -#include <stdbool.h> +#include "celix_long_hash_map.h" #ifdef __cplusplus extern "C" {
