celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject svn commit: r1642714 - in /celix/trunk/remote_services/remote_service_admin_shm/private/src: export_registration_impl.c import_registration_impl.c remote_service_admin_activator.c remote_service_admin_impl.c
Date Mon, 01 Dec 2014 17:09:16 GMT
Author: bpetri
Date: Mon Dec  1 17:09:15 2014
New Revision: 1642714

URL: http://svn.apache.org/r1642714
Log:
CELIX-156: removed superfluous variables

Modified:
    celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
    celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
    celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
    celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c?rev=1642714&r1=1642713&r2=1642714&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
Mon Dec  1 17:09:15 2014
@@ -143,7 +143,6 @@ celix_status_t exportRegistration_endpoi
 
 celix_status_t exportRegistration_endpointModified(void * handle, service_reference_pt reference,
void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	export_registration_pt registration = handle;
 
 	return status;
 }

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c?rev=1642714&r1=1642713&r2=1642714&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
Mon Dec  1 17:09:15 2014
@@ -189,14 +189,12 @@ celix_status_t importRegistration_proxyF
 
 celix_status_t importRegistration_proxyFactoryModified(void * handle, service_reference_pt
reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	import_registration_factory_pt registration_factory = (import_registration_factory_pt) handle;
 
 	return status;
 }
 
 celix_status_t importRegistration_proxyFactoryRemoved(void * handle, service_reference_pt
reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	import_registration_pt registration = handle;
 
 	import_registration_factory_pt registration_factory = (import_registration_factory_pt) handle;
 	registration_factory->trackedFactory = NULL;

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c?rev=1642714&r1=1642713&r2=1642714&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
Mon Dec  1 17:09:15 2014
@@ -120,10 +120,13 @@ celix_status_t bundleActivator_destroy(v
 	struct activator *activator = userData;
 
 	if(activator==NULL || activator->admin==NULL){
-		return CELIX_BUNDLE_EXCEPTION;
+		status = CELIX_BUNDLE_EXCEPTION;
+	}
+	else {
+		status = remoteServiceAdmin_destroy(activator->admin);
 	}
 
-	return remoteServiceAdmin_destroy(activator->admin);
+	return status;
 }
 
 

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c?rev=1642714&r1=1642713&r2=1642714&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
Mon Dec  1 17:09:15 2014
@@ -67,7 +67,6 @@ celix_status_t remoteServiceAdmin_getSha
 celix_status_t remoteServiceAdmin_removeSharedIdentityFile(char *fwUuid, char* servicename);
 celix_status_t remoteServiceAdmin_removeSharedIdentityFiles(char* fwUuid);
 
-static bool lockHolder[3];
 
 celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_pt
*admin)
 {
@@ -747,7 +746,6 @@ celix_status_t remoteServiceAdmin_delete
 celix_status_t remoteServiceAdmin_createOrAttachShm(hash_map_pt ipcSegment, remote_service_admin_pt
admin, endpoint_description_pt endpointDescription, bool createIfNotFound)
 {
     celix_status_t status = CELIX_SUCCESS;
-    apr_status_t aprStatus = 0;
 
     /* setup ipc sehment */
     ipc_segment_pt ipc = NULL;



Mime
View raw message