celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject [14/19] celix git commit: CELIX-258: rename framework bundleActivator to frameworkActivator
Date Mon, 28 Sep 2015 10:02:59 GMT
CELIX-258: rename framework bundleActivator to frameworkActivator


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/7e3b33f6
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/7e3b33f6
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/7e3b33f6

Branch: refs/heads/feature/CELIX-247_android_support
Commit: 7e3b33f625e6f00b285d5ce9db3020ece4bccc1f
Parents: e59dea5
Author: Bjoern Petri <bpetri@apache.org>
Authored: Fri Sep 25 19:12:03 2015 +0200
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Fri Sep 25 19:12:03 2015 +0200

----------------------------------------------------------------------
 framework/private/src/framework.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/7e3b33f6/framework/private/src/framework.c
----------------------------------------------------------------------
diff --git a/framework/private/src/framework.c b/framework/private/src/framework.c
index 6aad985..e0391e7 100644
--- a/framework/private/src/framework.c
+++ b/framework/private/src/framework.c
@@ -104,6 +104,11 @@ static celix_status_t framework_loadBundleLibraries(framework_pt framework,
bund
 static celix_status_t framework_loadLibraries(framework_pt framework, char *libraries, char
*activator, bundle_archive_pt archive, void **activatorHandle);
 static celix_status_t framework_loadLibrary(framework_pt framework, char *library, bundle_archive_pt
archive, void **handle);
 
+static celix_status_t frameworkActivator_start(void * userData, bundle_context_pt context);
+static celix_status_t frameworkActivator_stop(void * userData, bundle_context_pt context);
+static celix_status_t frameworkActivator_destroy(void * userData, bundle_context_pt context);
+
+
 struct fw_refreshHelper {
     framework_pt framework;
     bundle_pt bundle;
@@ -2303,12 +2308,12 @@ celix_status_t fw_invokeFrameworkListener(framework_pt framework,
framework_list
 	return ret;
 }
 
-celix_status_t frameworkActivator_start(void * userData, bundle_context_pt context) {
+static celix_status_t frameworkActivator_start(void * userData, bundle_context_pt context)
{
 	// nothing to do
 	return CELIX_SUCCESS;
 }
 
-celix_status_t frameworkActivator_stop(void * userData, bundle_context_pt context) {
+static celix_status_t frameworkActivator_stop(void * userData, bundle_context_pt context)
{
     celix_status_t status = CELIX_SUCCESS;
 
 	celix_thread_t shutdownThread;
@@ -2333,7 +2338,7 @@ celix_status_t frameworkActivator_stop(void * userData, bundle_context_pt
contex
 	return status;
 }
 
-celix_status_t frameworkActivator_destroy(void * userData, bundle_context_pt context) {
+static celix_status_t frameworkActivator_destroy(void * userData, bundle_context_pt context)
{
 	return CELIX_SUCCESS;
 }
 


Mime
View raw message