You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2018/05/29 17:33:10 UTC
[5/5] celix git commit: Merge branch 'develop' into
feature/CELIX-426-cxx-api
Merge branch 'develop' into feature/CELIX-426-cxx-api
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/be6612f0
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/be6612f0
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/be6612f0
Branch: refs/heads/feature/CELIX-426-cxx-api
Commit: be6612f0f259cf080fe5ca1f6fbbfa9bb61a502c
Parents: e633316 dfa9d1c
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue May 29 19:32:57 2018 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue May 29 19:32:57 2018 +0200
----------------------------------------------------------------------
.travis.yml | 4 -
.../examples/mp_pubsub/publisher/CMakeLists.txt | 10 +-
.../mp_pubsub/subscriber/CMakeLists.txt | 10 +-
.../examples/pubsub/publisher/CMakeLists.txt | 12 +-
.../examples/pubsub/publisher2/CMakeLists.txt | 12 +-
.../examples/pubsub/subscriber/CMakeLists.txt | 12 +-
.../best_practice_example_c/bar/CMakeLists.txt | 13 +-
.../bar/private/src/bar_activator.c | 53 +-
.../best_practice_example_c/foo1/CMakeLists.txt | 13 +-
.../foo1/private/src/foo1_activator.c | 87 +-
.../best_practice_example_c/foo2/CMakeLists.txt | 13 +-
.../foo2/private/src/foo2_activator.c | 83 +-
.../src/dynamic_consumer_example.c | 41 +-
.../src/dynamic_provider_example.c | 51 +-
.../src/simple_consumer_example.c | 29 +-
.../src/simple_provider_example.c | 39 +-
libs/framework/include/bundle.h | 7 +-
libs/framework/include/bundle_activator.h | 39 +
libs/framework/include/framework.h | 5 +-
libs/framework/private/mock/bundle_mock.c | 4 +-
libs/framework/private/test/bundle_test.cpp | 6 +-
libs/framework/src/bundle.c | 4 +-
libs/framework/src/bundle.c.orig | 779 -----
libs/framework/src/bundle_context.c.orig | 963 ------
libs/framework/src/bundle_private.h | 4 +-
libs/framework/src/framework.c | 43 +-
libs/framework/src/framework.c.orig | 2829 ------------------
libs/utils/CMakeLists.txt | 1 -
libs/utils/CMakeLists.txt.orig | 129 -
utils/include/celix_exports.h | 25 -
30 files changed, 244 insertions(+), 5076 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/be6612f0/libs/framework/include/bundle.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/be6612f0/libs/framework/include/framework.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/be6612f0/libs/framework/private/mock/bundle_mock.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/be6612f0/libs/framework/src/bundle.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/be6612f0/libs/framework/src/framework.c
----------------------------------------------------------------------
diff --cc libs/framework/src/framework.c
index a98be36,c28153a..b0a0a67
--- a/libs/framework/src/framework.c
+++ b/libs/framework/src/framework.c
@@@ -49,9 -49,9 +49,9 @@@ typedef celix_status_t (*start_function
typedef celix_status_t (*stop_function_fp)(void *userData, bundle_context_t *context);
typedef celix_status_t (*destroy_function_fp)(void *userData, bundle_context_t *context);
- struct activator {
+ struct celix_bundle_activator {
void * userData;
-
+
create_function_fp create;
start_function_fp start;
stop_function_fp stop;
@@@ -774,9 -773,9 +773,9 @@@ celix_status_t fw_startBundle(framework
module_getSymbolicName(module, &name);
status = CELIX_DO_IF(status, bundleContext_create(framework, framework->logger, bundle, &context));
status = CELIX_DO_IF(status, bundle_setContext(bundle, context));
-
+
if (status == CELIX_SUCCESS) {
- activator = (activator_pt) calloc(1,(sizeof(*activator)));
+ activator = calloc(1,(sizeof(*activator)));
if (activator == NULL) {
status = CELIX_ENOMEM;
} else {