From 61c641abe6479472a00ddf2a1a68490cef2a1167 Mon Sep 17 00:00:00 2001 From: Pepijn Noltes Date: Sun, 31 Dec 2023 00:41:17 +0100 Subject: [PATCH] Replace array_list with celix_array_list in rsa shm v2 --- .../rsa_shm/src/rsa_shm_impl.c | 8 ++++---- .../rsa_shm/src/rsa_shm_impl.h | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c index c93ac4955..ba2fd6f31 100755 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.c @@ -380,9 +380,9 @@ celix_status_t rsaShm_exportService(rsa_shm_t *admin, char *serviceId, } // Create export registrations for its interfaces. - size_t interfaceNum = arrayList_size(interfaces); + size_t interfaceNum = celix_arrayList_size(interfaces); for (int iter = 0; iter < interfaceNum; iter++) { - char *interface = arrayList_get(interfaces, iter); + char *interface = celix_arrayList_get(interfaces, iter); celix_autoptr(endpoint_description_t) endpointDescription = NULL; export_registration_t *registration = NULL; int ret = CELIX_SUCCESS; @@ -538,13 +538,13 @@ static celix_status_t rsaShm_createEndpointDescription(rsa_shm_t *admin, } //LCOV_EXCL_START -celix_status_t rsaShm_getExportedServices(rsa_shm_t *admin CELIX_UNUSED, array_list_pt *services CELIX_UNUSED) { +celix_status_t rsaShm_getExportedServices(rsa_shm_t *admin CELIX_UNUSED, celix_array_list_t** services CELIX_UNUSED) { celix_status_t status = CELIX_SUCCESS; //It is stub and will not be called at present. return status; } -celix_status_t rsaShm_getImportedEndpoints(rsa_shm_t *admin CELIX_UNUSED, array_list_pt *services CELIX_UNUSED) { +celix_status_t rsaShm_getImportedEndpoints(rsa_shm_t *admin CELIX_UNUSED, celix_array_list_t** services CELIX_UNUSED) { celix_status_t status = CELIX_SUCCESS; //It is stub and will not be called at present. return status; diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.h b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.h index 4d8e4a39f..72dc471c1 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.h +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/src/rsa_shm_impl.h @@ -23,6 +23,7 @@ #ifdef __cplusplus extern "C" { #endif + #include "rsa_shm_export_registration.h" #include "rsa_shm_import_registration.h" #include "endpoint_description.h" @@ -49,9 +50,9 @@ celix_status_t rsaShm_exportService(rsa_shm_t *admin, char *serviceId, celix_status_t rsaShm_removeExportedService(rsa_shm_t *admin, export_registration_t *registration); -celix_status_t rsaShm_getExportedServices(rsa_shm_t *admin, array_list_pt *services); +celix_status_t rsaShm_getExportedServices(rsa_shm_t *admin, celix_array_list_t** services); -celix_status_t rsaShm_getImportedEndpoints(rsa_shm_t *admin, array_list_pt *services); +celix_status_t rsaShm_getImportedEndpoints(rsa_shm_t *admin, celix_array_list_t** services); celix_status_t rsaShm_importService(rsa_shm_t *admin, endpoint_description_t *endpointDescription, import_registration_t **registration);