This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/509-remove-cpputests
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/509-remove-cpputests
by this push:
new 1f8dea82 Fix invalid snprintf
1f8dea82 is described below
commit 1f8dea82bbfddf6941465b27db4fd4cdf2af9139
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Dec 31 18:10:49 2023 +0100
Fix invalid snprintf
Also fix invalid array create in dm_dependency_manager_impl.c and
add missing status initialize in service_registry.c.
---
libs/framework/src/dm_dependency_manager_impl.c | 3 ++-
libs/framework/src/service_registry.c | 2 +-
libs/utils/src/ip_utils.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libs/framework/src/dm_dependency_manager_impl.c
b/libs/framework/src/dm_dependency_manager_impl.c
index 8c574428..d4e40f46 100644
--- a/libs/framework/src/dm_dependency_manager_impl.c
+++ b/libs/framework/src/dm_dependency_manager_impl.c
@@ -30,6 +30,7 @@
#include "celix_bundle.h"
#include "celix_compiler.h"
#include "celix_framework.h"
+#include "celix_array_list.h"
celix_dependency_manager_t*
celix_private_dependencyManager_create(celix_bundle_context_t *context) {
celix_dependency_manager_t *manager = calloc(1, sizeof(*manager));
@@ -367,7 +368,7 @@ celix_status_t
dependencyManager_getInfo(celix_dependency_manager_t *manager, dm
celixThreadMutex_lock(&manager->mutex);
if (info != NULL) {
- celix_arrayList_create(&info->components);
+ info->components = celix_arrayList_create();
size = celix_arrayList_size(manager->components);
for (i = 0; i < size; i += 1) {
celix_dm_component_t *cmp =
celix_arrayList_get(manager->components, i);
diff --git a/libs/framework/src/service_registry.c
b/libs/framework/src/service_registry.c
index f75da80e..5872dabe 100644
--- a/libs/framework/src/service_registry.c
+++ b/libs/framework/src/service_registry.c
@@ -677,7 +677,7 @@ size_t serviceRegistry_nrOfHooks(service_registry_pt
registry) {
}
static celix_status_t serviceRegistry_getUsingBundles(service_registry_pt
registry, service_registration_pt registration, celix_array_list_t** out) {
- celix_status_t status;
+ celix_status_t status = CELIX_SUCCESS;
celix_array_list_t* bundles = NULL;
hash_map_iterator_pt iter;
diff --git a/libs/utils/src/ip_utils.c b/libs/utils/src/ip_utils.c
index 12cde0a3..8d5e0df4 100644
--- a/libs/utils/src/ip_utils.c
+++ b/libs/utils/src/ip_utils.c
@@ -91,7 +91,7 @@ char* celix_utils_convertUintToIp(uint32_t ip) {
ip -= ipPart3 * (int64_t)pow(256, 1);
int64_t ipPart4 = ip / (int64_t)pow(256, 0);
- snprintf(ipStr, 16, "%li.%li.%li.%li", ipPart1, ipPart2, ipPart3, ipPart4);
+ snprintf(ipStr, 16, "%i.%i.%i.%i", (int)ipPart1, (int)ipPart2,
(int)ipPart3, (int)ipPart4);
return ipStr;
}