This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/511-remove-resolver
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/511-remove-resolver by
this push:
new d6637a98 Remove support for wire.
d6637a98 is described below
commit d6637a982fa96569b6ac584bdc858342994af8a2
Author: PengZheng <[email protected]>
AuthorDate: Sun Jul 30 16:52:33 2023 +0800
Remove support for wire.
---
libs/framework/src/wire.c | 53 ++++++++++++++---------------------------------
1 file changed, 16 insertions(+), 37 deletions(-)
diff --git a/libs/framework/src/wire.c b/libs/framework/src/wire.c
index 993e91c6..ae13dd8f 100644
--- a/libs/framework/src/wire.c
+++ b/libs/framework/src/wire.c
@@ -29,60 +29,39 @@
#include "wire.h"
struct wire {
- module_pt importer;
- requirement_pt requirement;
- module_pt exporter;
- capability_pt capability;
+ module_pt importer;
+ requirement_pt requirement;
+ module_pt exporter;
+ capability_pt capability;
};
-celix_status_t wire_create(module_pt importer, requirement_pt requirement,
- module_pt exporter, capability_pt capability, wire_pt *wire) {
- celix_status_t status = CELIX_SUCCESS;
+//LCOV_EXCL_START
+celix_status_t wire_create(
+ module_pt importer, requirement_pt requirement, module_pt exporter,
capability_pt capability, wire_pt* wire) {
+ celix_status_t status = CELIX_FRAMEWORK_EXCEPTION;
- if (*wire != NULL) {
- status = CELIX_ILLEGAL_ARGUMENT;
- } else {
- (*wire) = (wire_pt) malloc(sizeof(**wire));
- if (!*wire) {
- status = CELIX_ENOMEM;
- } else {
- (*wire)->importer = importer;
- (*wire)->requirement = requirement;
- (*wire)->exporter = exporter;
- (*wire)->capability = capability;
- }
- }
+ framework_logIfError(celix_frameworkLogger_globalLogger(), status,
NULL, "Cannot create wire");
- framework_logIfError(celix_frameworkLogger_globalLogger(), status,
NULL, "Cannot create wire");
-
- return status;
+ return status;
}
celix_status_t wire_destroy(wire_pt wire) {
- wire->importer = NULL;
- wire->requirement = NULL;
- wire->exporter = NULL;
- wire->capability = NULL;
- free(wire);
- return CELIX_SUCCESS;
+ return CELIX_FRAMEWORK_EXCEPTION;
}
celix_status_t wire_getCapability(wire_pt wire, capability_pt *capability) {
- *capability = wire->capability;
- return CELIX_SUCCESS;
+ return CELIX_FRAMEWORK_EXCEPTION;
}
celix_status_t wire_getRequirement(wire_pt wire, requirement_pt *requirement) {
- *requirement = wire->requirement;
- return CELIX_SUCCESS;
+ return CELIX_FRAMEWORK_EXCEPTION;
}
celix_status_t wire_getImporter(wire_pt wire, module_pt *importer) {
- *importer = wire->importer;
- return CELIX_SUCCESS;
+ return CELIX_FRAMEWORK_EXCEPTION;
}
celix_status_t wire_getExporter(wire_pt wire, module_pt *exporter) {
- *exporter = wire->exporter;
- return CELIX_SUCCESS;
+ return CELIX_FRAMEWORK_EXCEPTION;
}
+//LCOV_EXCL_STOP