You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2015/11/11 22:11:55 UTC
celix git commit: CELIX-289: partly revert of
aec12cd9014aa0677599d01fd9e611d81eb563a9
Repository: celix
Updated Branches:
refs/heads/develop 1b7b3e8b9 -> 4f6b0c08d
CELIX-289: partly revert of aec12cd9014aa0677599d01fd9e611d81eb563a9
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/4f6b0c08
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/4f6b0c08
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/4f6b0c08
Branch: refs/heads/develop
Commit: 4f6b0c08d5f4dc25d4a4028cf024b6b718bf9e85
Parents: 1b7b3e8
Author: Bjoern Petri <bp...@apache.org>
Authored: Wed Nov 11 22:09:35 2015 +0100
Committer: Bjoern Petri <bp...@apache.org>
Committed: Wed Nov 11 22:09:35 2015 +0100
----------------------------------------------------------------------
deployment_admin/private/src/deployment_admin_activator.c | 2 +-
deployment_admin/private/src/log.c | 2 +-
log_service/private/src/log.c | 10 +++++-----
log_service/public/src/log_helper.c | 4 ++--
.../discovery/private/src/endpoint_discovery_poller.c | 2 +-
.../topology_manager/private/src/topology_manager.c | 3 ---
6 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/4f6b0c08/deployment_admin/private/src/deployment_admin_activator.c
----------------------------------------------------------------------
diff --git a/deployment_admin/private/src/deployment_admin_activator.c b/deployment_admin/private/src/deployment_admin_activator.c
index 9a3ce5f..93fd6b5 100644
--- a/deployment_admin/private/src/deployment_admin_activator.c
+++ b/deployment_admin/private/src/deployment_admin_activator.c
@@ -64,7 +64,7 @@ celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context)
}
celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
bundle_activator_pt activator = (bundle_activator_pt) userData;
http://git-wip-us.apache.org/repos/asf/celix/blob/4f6b0c08/deployment_admin/private/src/log.c
----------------------------------------------------------------------
diff --git a/deployment_admin/private/src/log.c b/deployment_admin/private/src/log.c
index a5227ca..98e757d 100644
--- a/deployment_admin/private/src/log.c
+++ b/deployment_admin/private/src/log.c
@@ -55,7 +55,7 @@ celix_status_t log_destroy(log_pt *log) {
}
celix_status_t log_log(log_pt log, unsigned int type, properties_pt properties) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
log_event_pt event = NULL;
http://git-wip-us.apache.org/repos/asf/celix/blob/4f6b0c08/log_service/private/src/log.c
----------------------------------------------------------------------
diff --git a/log_service/private/src/log.c b/log_service/private/src/log.c
index 201c29d..a6c3887 100644
--- a/log_service/private/src/log.c
+++ b/log_service/private/src/log.c
@@ -222,7 +222,7 @@ celix_status_t log_bundleChanged(void *listener, bundle_event_pt event) {
}
celix_status_t log_frameworkEvent(void *listener, framework_event_pt event) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
log_pt logger = ((framework_listener_pt) listener)->handle;
log_entry_pt entry = NULL;
@@ -235,7 +235,7 @@ celix_status_t log_frameworkEvent(void *listener, framework_event_pt event) {
}
celix_status_t log_addLogListener(log_pt logger, log_listener_pt listener) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
status = celixThreadMutex_lock(&logger->listenerLock);
@@ -280,7 +280,7 @@ celix_status_t log_removeLogListener(log_pt logger, log_listener_pt listener) {
}
celix_status_t log_removeAllLogListener(log_pt logger) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
status = celixThreadMutex_lock(&logger->listenerLock);
@@ -294,7 +294,7 @@ celix_status_t log_removeAllLogListener(log_pt logger) {
}
static celix_status_t log_startListenerThread(log_pt logger) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
logger->running = true;
logger->running = true;
@@ -304,7 +304,7 @@ static celix_status_t log_startListenerThread(log_pt logger) {
}
static celix_status_t log_stopListenerThread(log_pt logger) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
logger->running = false;
http://git-wip-us.apache.org/repos/asf/celix/blob/4f6b0c08/log_service/public/src/log_helper.c
----------------------------------------------------------------------
diff --git a/log_service/public/src/log_helper.c b/log_service/public/src/log_helper.c
index 0b17a36..69ea3eb 100644
--- a/log_service/public/src/log_helper.c
+++ b/log_service/public/src/log_helper.c
@@ -84,7 +84,7 @@ celix_status_t logHelper_create(bundle_context_pt context, log_helper_pt* loghel
celix_status_t logHelper_start(log_helper_pt loghelper)
{
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
service_tracker_customizer_pt logTrackerCustomizer = NULL;
status = serviceTrackerCustomizer_create(loghelper, NULL, logHelper_logServiceAdded, NULL, logHelper_logServiceRemoved, &logTrackerCustomizer);
@@ -126,7 +126,7 @@ celix_status_t logHelper_logServiceRemoved(void *handle, service_reference_pt re
celix_status_t logHelper_stop(log_helper_pt loghelper) {
- celix_status_t status = CELIX_SUCCESS;
+ celix_status_t status;
status = serviceTracker_close(loghelper->logServiceTracker);
http://git-wip-us.apache.org/repos/asf/celix/blob/4f6b0c08/remote_services/discovery/private/src/endpoint_discovery_poller.c
----------------------------------------------------------------------
diff --git a/remote_services/discovery/private/src/endpoint_discovery_poller.c b/remote_services/discovery/private/src/endpoint_discovery_poller.c
index 60a9236..ec0a1b3 100644
--- a/remote_services/discovery/private/src/endpoint_discovery_poller.c
+++ b/remote_services/discovery/private/src/endpoint_discovery_poller.c
@@ -242,7 +242,7 @@ celix_status_t endpointDiscoveryPoller_removeDiscoveryEndpoint(endpoint_discover
celix_status_t endpointDiscoveryPoller_poll(endpoint_discovery_poller_pt poller, char *url, array_list_pt currentEndpoints) {
- celix_status_t status = NULL;
+ celix_status_t status;
array_list_pt updatedEndpoints = NULL;
// create an arraylist with a custom equality test to ensure we can find endpoints properly...
http://git-wip-us.apache.org/repos/asf/celix/blob/4f6b0c08/remote_services/topology_manager/private/src/topology_manager.c
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/private/src/topology_manager.c b/remote_services/topology_manager/private/src/topology_manager.c
index 7711d53..acc6941 100644
--- a/remote_services/topology_manager/private/src/topology_manager.c
+++ b/remote_services/topology_manager/private/src/topology_manager.c
@@ -287,9 +287,6 @@ celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt re
topologyManager_notifyListenersEndpointRemoved(manager, rsa, export);
rsa->exportRegistration_close(export);
}
-
- arrayList_destroy(exports_list);
- exports_list = NULL;
}
hashMap_remove(exports, rsa);