incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject svn commit: r1492377 [9/12] - in /incubator/celix/trunk: dependency_manager/private/src/ dependency_manager/public/include/ deployment_admin/private/include/ deployment_admin/private/src/ deployment_admin/public/include/ device_access/device_access/pri...
Date Wed, 12 Jun 2013 19:08:55 GMT
Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c Wed Jun 12 19:08:50 2013
@@ -36,14 +36,14 @@
 #include "example_service.h"
 
 
-void sqrtCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
-celix_status_t sqrtCommand_isNumeric(COMMAND command, char *number, bool *ret);
+void sqrtCommand_execute(command_pt command, char * line, void (*out)(char *), void (*err)(char *));
+celix_status_t sqrtCommand_isNumeric(command_pt command, char *number, bool *ret);
 
-COMMAND sqrtCommand_create(bundle_context_t context) {
+command_pt sqrtCommand_create(bundle_context_pt context) {
 	apr_pool_t *pool;
 	bundleContext_getMemoryPool(context, &pool);
 
-    COMMAND command = (COMMAND) apr_palloc(pool, sizeof(*command));
+    command_pt command = (command_pt) apr_palloc(pool, sizeof(*command));
     if (command) {
 		command->bundleContext = context;
 		command->name = "sqrt";
@@ -54,12 +54,12 @@ COMMAND sqrtCommand_create(bundle_contex
     return command;
 }
 
-void sqrtCommand_destroy(COMMAND command) {
+void sqrtCommand_destroy(command_pt command) {
 }
 
-void sqrtCommand_execute(COMMAND command, char *line, void (*out)(char *), void (*err)(char *)) {
+void sqrtCommand_execute(command_pt command, char *line, void (*out)(char *), void (*err)(char *)) {
 	celix_status_t status = CELIX_SUCCESS;
-    service_reference_t exampleService = NULL;
+    service_reference_pt exampleService = NULL;
     apr_pool_t *memory_pool = NULL;
     apr_pool_t *bundle_memory_pool = NULL;
 
@@ -71,7 +71,7 @@ void sqrtCommand_execute(COMMAND command
 		bool numeric;
 		sqrtCommand_isNumeric(command, aStr, &numeric);
 		if (aStr != NULL && numeric) {
-			example_service_t example = NULL;
+			example_service_pt example = NULL;
 			status = bundleContext_getService(command->bundleContext, exampleService, (void *) &example);
 			if (status == CELIX_SUCCESS) {
 				double a = atof(aStr);
@@ -101,7 +101,7 @@ void sqrtCommand_execute(COMMAND command
     //return status;
 }
 
-celix_status_t sqrtCommand_isNumeric(COMMAND command, char *number, bool *ret) {
+celix_status_t sqrtCommand_isNumeric(command_pt command, char *number, bool *ret) {
 	celix_status_t status = CELIX_SUCCESS;
 	*ret = true;
 	while(*number) {

Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c Wed Jun 12 19:08:50 2013
@@ -36,14 +36,14 @@
 #include "example_service.h"
 
 
-void subCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
-celix_status_t subCommand_isNumeric(COMMAND command, char *number, bool *ret);
+void subCommand_execute(command_pt command, char * line, void (*out)(char *), void (*err)(char *));
+celix_status_t subCommand_isNumeric(command_pt command, char *number, bool *ret);
 
-COMMAND subCommand_create(bundle_context_t context) {
+command_pt subCommand_create(bundle_context_pt context) {
 	apr_pool_t *pool;
 	bundleContext_getMemoryPool(context, &pool);
 
-    COMMAND command = (COMMAND) apr_palloc(pool, sizeof(*command));
+    command_pt command = (command_pt) apr_palloc(pool, sizeof(*command));
     if (command) {
 		command->bundleContext = context;
 		command->name = "sub";
@@ -54,12 +54,12 @@ COMMAND subCommand_create(bundle_context
     return command;
 }
 
-void subCommand_destroy(COMMAND command) {
+void subCommand_destroy(command_pt command) {
 }
 
-void subCommand_execute(COMMAND command, char *line, void (*out)(char *), void (*err)(char *)) {
+void subCommand_execute(command_pt command, char *line, void (*out)(char *), void (*err)(char *)) {
 	celix_status_t status = CELIX_SUCCESS;
-    service_reference_t exampleService = NULL;
+    service_reference_pt exampleService = NULL;
     apr_pool_t *memory_pool = NULL;
     apr_pool_t *bundle_memory_pool = NULL;
 
@@ -74,7 +74,7 @@ void subCommand_execute(COMMAND command,
 			char *bStr = apr_strtok(NULL, " ", &token);
 			subCommand_isNumeric(command, bStr, &numeric);
 			if (bStr != NULL && numeric) {
-				example_service_t example = NULL;
+				example_service_pt example = NULL;
 				status = bundleContext_getService(command->bundleContext, exampleService, (void *) &example);
 				if (status == CELIX_SUCCESS) {
 					double a = atof(aStr);
@@ -108,7 +108,7 @@ void subCommand_execute(COMMAND command,
     //return status;
 }
 
-celix_status_t subCommand_isNumeric(COMMAND command, char *number, bool *ret) {
+celix_status_t subCommand_isNumeric(command_pt command, char *number, bool *ret) {
 	celix_status_t status = CELIX_SUCCESS;
 	*ret = true;
 	while(*number) {

Modified: incubator/celix/trunk/remote_services/discovery/private/include/discovery.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/include/discovery.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/include/discovery.h (original)
+++ incubator/celix/trunk/remote_services/discovery/private/include/discovery.h Wed Jun 12 19:08:50 2013
@@ -29,20 +29,20 @@
 
 #include "endpoint_listener.h"
 
-typedef struct discovery *discovery_t;
+typedef struct discovery *discovery_pt;
 
-celix_status_t discovery_create(apr_pool_t *pool, bundle_context_t context, discovery_t *discovery);
-celix_status_t discovery_stop(discovery_t discovery);
+celix_status_t discovery_create(apr_pool_t *pool, bundle_context_pt context, discovery_pt *discovery);
+celix_status_t discovery_stop(discovery_pt discovery);
 
-celix_status_t discovery_endpointAdded(void *handle, endpoint_description_t endpoint, char *machtedFilter);
-celix_status_t discovery_endpointRemoved(void *handle, endpoint_description_t endpoint, char *machtedFilter);
+celix_status_t discovery_endpointAdded(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
+celix_status_t discovery_endpointRemoved(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
 
-celix_status_t discovery_endpointListenerAdding(void * handle, service_reference_t reference, void **service);
-celix_status_t discovery_endpointListenerAdded(void * handle, service_reference_t reference, void * service);
-celix_status_t discovery_endpointListenerModified(void * handle, service_reference_t reference, void * service);
-celix_status_t discovery_endpointListenerRemoved(void * handle, service_reference_t reference, void * service);
+celix_status_t discovery_endpointListenerAdding(void * handle, service_reference_pt reference, void **service);
+celix_status_t discovery_endpointListenerAdded(void * handle, service_reference_pt reference, void * service);
+celix_status_t discovery_endpointListenerModified(void * handle, service_reference_pt reference, void * service);
+celix_status_t discovery_endpointListenerRemoved(void * handle, service_reference_pt reference, void * service);
 
-celix_status_t discovery_updateEndpointListener(discovery_t discovery, service_reference_t reference, endpoint_listener_t service);
+celix_status_t discovery_updateEndpointListener(discovery_pt discovery, service_reference_pt reference, endpoint_listener_pt service);
 
 
 #endif /* DISCOVERY_H_ */

Modified: incubator/celix/trunk/remote_services/discovery/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/src/discovery.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery/private/src/discovery.c Wed Jun 12 19:08:50 2013
@@ -40,20 +40,20 @@
 #include "discovery.h"
 
 struct discovery {
-	bundle_context_t context;
+	bundle_context_pt context;
 	apr_pool_t *pool;
 
-	hash_map_t listenerReferences;
+	hash_map_pt listenerReferences;
 
 	bool running;
 	apr_thread_t *slpPoll;
 
-	hash_map_t slpServices;
+	hash_map_pt slpServices;
 
 	char *rsaPort;
 
-	array_list_t handled;
-	array_list_t registered;
+	array_list_pt handled;
+	array_list_pt registered;
 };
 
 struct slp_service {
@@ -61,22 +61,22 @@ struct slp_service {
 	char *attributes;
 };
 
-typedef struct slp_service *slp_service_t;
+typedef struct slp_service *slp_service_pt;
 
-celix_status_t discovery_informListener(discovery_t discovery, endpoint_listener_t listener, endpoint_description_t endpoint);
-celix_status_t discovery_informListenerOfRemoval(discovery_t discovery, endpoint_listener_t listener, endpoint_description_t endpoint);
+celix_status_t discovery_informListener(discovery_pt discovery, endpoint_listener_pt listener, endpoint_description_pt endpoint);
+celix_status_t discovery_informListenerOfRemoval(discovery_pt discovery, endpoint_listener_pt listener, endpoint_description_pt endpoint);
 
-celix_status_t discovery_addService(discovery_t discovery, endpoint_description_t endpoint);
-celix_status_t discovery_removeService(discovery_t discovery, endpoint_description_t endpoint);
+celix_status_t discovery_addService(discovery_pt discovery, endpoint_description_pt endpoint);
+celix_status_t discovery_removeService(discovery_pt discovery, endpoint_description_pt endpoint);
 
 static void *APR_THREAD_FUNC discovery_pollSLP(apr_thread_t *thd, void *data);
 SLPBoolean discovery_pollSLPCallback(SLPHandle hslp, const char* srvurl, unsigned short lifetime, SLPError errcode, void* cookie);
 SLPBoolean discovery_attributesCallback(SLPHandle hslp, const char *attributes, SLPError error, void *cookie);
 
-celix_status_t discovery_deregisterEndpoint(discovery_t discovery, const char *serviceUrl);
+celix_status_t discovery_deregisterEndpoint(discovery_pt discovery, const char *serviceUrl);
 void discovery_deregistrationReport(SLPHandle hslp, SLPError errcode, void* cookie);
 
-celix_status_t discovery_create(apr_pool_t *pool, bundle_context_t context, discovery_t *discovery) {
+celix_status_t discovery_create(apr_pool_t *pool, bundle_context_pt context, discovery_pt *discovery) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*discovery = apr_palloc(pool, sizeof(**discovery));
@@ -103,7 +103,7 @@ celix_status_t discovery_create(apr_pool
 	return status;
 }
 
-celix_status_t discovery_deregisterEndpoint(discovery_t discovery, const char *serviceUrl) {
+celix_status_t discovery_deregisterEndpoint(discovery_pt discovery, const char *serviceUrl) {
 	celix_status_t status = CELIX_SUCCESS;
 	printf("DISCOVERY: Remove endpoint: %s\n", serviceUrl);
 
@@ -126,7 +126,7 @@ celix_status_t discovery_deregisterEndpo
 	return status;
 }
 
-celix_status_t discovery_stop(discovery_t discovery) {
+celix_status_t discovery_stop(discovery_pt discovery) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_status_t tstat;
@@ -145,16 +145,16 @@ celix_status_t discovery_stop(discovery_
 	return status;
 }
 
-celix_status_t discovery_removeService(discovery_t discovery, endpoint_description_t endpoint) {
+celix_status_t discovery_removeService(discovery_pt discovery, endpoint_description_pt endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 	printf("DISCOVERY: Remove service (%s)\n", endpoint->service);
 
 	// Inform listeners of new endpoint
-	hash_map_iterator_t iter = hashMapIterator_create(discovery->listenerReferences);
+	hash_map_iterator_pt iter = hashMapIterator_create(discovery->listenerReferences);
 	while (hashMapIterator_hasNext(iter)) {
-		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
-		service_reference_t reference = hashMapEntry_getKey(entry);
-		endpoint_listener_t listener = NULL;
+		hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+		service_reference_pt reference = hashMapEntry_getKey(entry);
+		endpoint_listener_pt listener = NULL;
 		bundleContext_getService(discovery->context, reference, (void**)&listener);
 		discovery_informListenerOfRemoval(discovery, listener, endpoint);
 	}
@@ -162,22 +162,22 @@ celix_status_t discovery_removeService(d
 	return status;
 }
 
-celix_status_t discovery_addService(discovery_t discovery, endpoint_description_t endpoint) {
+celix_status_t discovery_addService(discovery_pt discovery, endpoint_description_pt endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	// Inform listeners of new endpoint
-	hash_map_iterator_t iter = hashMapIterator_create(discovery->listenerReferences);
+	hash_map_iterator_pt iter = hashMapIterator_create(discovery->listenerReferences);
 	while (hashMapIterator_hasNext(iter)) {
-		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
-		service_reference_t reference = hashMapEntry_getKey(entry);
-		endpoint_listener_t listener = NULL;
+		hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+		service_reference_pt reference = hashMapEntry_getKey(entry);
+		endpoint_listener_pt listener = NULL;
 
-		service_registration_t registration = NULL;
+		service_registration_pt registration = NULL;
 		serviceReference_getServiceRegistration(reference, &registration);
-		properties_t serviceProperties = NULL;
+		properties_pt serviceProperties = NULL;
 		serviceRegistration_getProperties(registration, &serviceProperties);
 		char *scope = properties_get(serviceProperties, (char *) ENDPOINT_LISTENER_SCOPE);
-		filter_t filter = filter_create(scope, discovery->pool);
+		filter_pt filter = filter_create(scope, discovery->pool);
 		bool matchResult = false;
 		filter_match(filter, endpoint->properties, &matchResult);
 		if (matchResult) {
@@ -190,19 +190,19 @@ celix_status_t discovery_addService(disc
 	return status;
 }
 
-celix_status_t discovery_informListener(discovery_t discovery, endpoint_listener_t listener, endpoint_description_t endpoint) {
+celix_status_t discovery_informListener(discovery_pt discovery, endpoint_listener_pt listener, endpoint_description_pt endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 	listener->endpointAdded(listener->handle, endpoint, NULL);
 	return status;
 }
 
-celix_status_t discovery_informListenerOfRemoval(discovery_t discovery, endpoint_listener_t listener, endpoint_description_t endpoint) {
+celix_status_t discovery_informListenerOfRemoval(discovery_pt discovery, endpoint_listener_pt listener, endpoint_description_pt endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 	listener->endpointRemoved(listener->handle, endpoint, NULL);
 	return status;
 }
 
-celix_status_t discovery_constructServiceUrl(discovery_t discovery, endpoint_description_t endpoint, char **serviceUrl) {
+celix_status_t discovery_constructServiceUrl(discovery_pt discovery, endpoint_description_pt endpoint, char **serviceUrl) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (*serviceUrl != NULL || discovery == NULL || endpoint == NULL) {
@@ -237,10 +237,10 @@ void discovery_registrationReport(SLPHan
 	*(SLPError*)cookie = errcode;
 }
 
-celix_status_t discovery_endpointAdded(void *handle, endpoint_description_t endpoint, char *machtedFilter) {
+celix_status_t discovery_endpointAdded(void *handle, endpoint_description_pt endpoint, char *machtedFilter) {
 	celix_status_t status = CELIX_SUCCESS;
 	printf("DISCOVERY: Endpoint for %s, with filter \"%s\" added\n", endpoint->service, machtedFilter);
-	discovery_t discovery = handle;
+	discovery_pt discovery = handle;
 	SLPError err;
 	SLPError callbackerr;
 	SLPHandle slp;
@@ -253,9 +253,9 @@ celix_status_t discovery_endpointAdded(v
 		status = discovery_constructServiceUrl(discovery, endpoint, &serviceUrl);
 		if (status == CELIX_SUCCESS) {
 			char *attributes = "";
-			hash_map_iterator_t iter = hashMapIterator_create(endpoint->properties);
+			hash_map_iterator_pt iter = hashMapIterator_create(endpoint->properties);
 			while (hashMapIterator_hasNext(iter)) {
-				hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+				hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
 				char *key = hashMapEntry_getKey(entry);
 				char *value = hashMapEntry_getValue(entry);
 				if (strlen(attributes) != 0) {
@@ -280,11 +280,11 @@ void discovery_deregistrationReport(SLPH
 	*(SLPError*)cookie = errcode;
 }
 
-celix_status_t discovery_endpointRemoved(void *handle, endpoint_description_t endpoint, char *machtedFilter) {
+celix_status_t discovery_endpointRemoved(void *handle, endpoint_description_pt endpoint, char *machtedFilter) {
 	celix_status_t status = CELIX_SUCCESS;
 	printf("DISCOVERY: Endpoint for %s, with filter \"%s\" removed\n", endpoint->service, machtedFilter);
 
-	discovery_t discovery = handle;
+	discovery_pt discovery = handle;
 	SLPError err;
 	SLPError callbackerr;
 	SLPHandle slp;
@@ -310,22 +310,22 @@ celix_status_t discovery_endpointRemoved
 	return status;
 }
 
-celix_status_t discovery_endpointListenerAdding(void * handle, service_reference_t reference, void **service) {
+celix_status_t discovery_endpointListenerAdding(void * handle, service_reference_pt reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
-	discovery_t discovery = handle;
+	discovery_pt discovery = handle;
 
 	bundleContext_getService(discovery->context, reference, service);
 
 	return status;
 }
 
-celix_status_t discovery_endpointListenerAdded(void * handle, service_reference_t reference, void * service) {
+celix_status_t discovery_endpointListenerAdded(void * handle, service_reference_pt reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
-	discovery_t discovery = handle;
+	discovery_pt discovery = handle;
 
-	service_registration_t registration = NULL;
+	service_registration_pt registration = NULL;
 	serviceReference_getServiceRegistration(reference, &registration);
-	properties_t serviceProperties = NULL;
+	properties_pt serviceProperties = NULL;
 	serviceRegistration_getProperties(registration, &serviceProperties);
 	char *discoveryListener = properties_get(serviceProperties, "DISCOVERY");
 
@@ -333,27 +333,27 @@ celix_status_t discovery_endpointListene
 		printf("DISCOVERY: EndpointListener Ignored - Discovery listener\n");
 	} else {
 		printf("DISCOVERY: EndpointListener Added - Add Scope\n");
-		discovery_updateEndpointListener(discovery, reference, (endpoint_listener_t) service);
+		discovery_updateEndpointListener(discovery, reference, (endpoint_listener_pt) service);
 	}
 
 	return status;
 }
 
-celix_status_t discovery_endpointListenerModified(void * handle, service_reference_t reference, void * service) {
+celix_status_t discovery_endpointListenerModified(void * handle, service_reference_pt reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
-	discovery_t discovery = handle;
+	discovery_pt discovery = handle;
 
 	printf("DISCOVERY: EndpointListener Modified - Update Scope\n");
-	discovery_updateEndpointListener(discovery, reference, (endpoint_listener_t) service);
+	discovery_updateEndpointListener(discovery, reference, (endpoint_listener_pt) service);
 
 	return status;
 }
 
-celix_status_t discovery_updateEndpointListener(discovery_t discovery, service_reference_t reference, endpoint_listener_t service) {
+celix_status_t discovery_updateEndpointListener(discovery_pt discovery, service_reference_pt reference, endpoint_listener_pt service) {
 	celix_status_t status = CELIX_SUCCESS;
 	char *scope = "createScopeHere";
 
-	array_list_t scopes = hashMap_get(discovery->listenerReferences, reference);
+	array_list_pt scopes = hashMap_get(discovery->listenerReferences, reference);
 	if (scopes == NULL) {
 		scopes = NULL;
 		arrayList_create(discovery->pool, &scopes);
@@ -364,20 +364,20 @@ celix_status_t discovery_updateEndpointL
 		arrayList_add(scopes, scope);
 	}
 
-	hash_map_iterator_t iter = hashMapIterator_create(discovery->slpServices);
+	hash_map_iterator_pt iter = hashMapIterator_create(discovery->slpServices);
 	while (hashMapIterator_hasNext(iter)) {
-		hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+		hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
 		char *key = hashMapEntry_getKey(entry);
-		endpoint_description_t value = hashMapEntry_getValue(entry);
+		endpoint_description_pt value = hashMapEntry_getValue(entry);
 		discovery_informListener(discovery, service, value);
 	}
 
 	return status;
 }
 
-celix_status_t discovery_endpointListenerRemoved(void * handle, service_reference_t reference, void * service) {
+celix_status_t discovery_endpointListenerRemoved(void * handle, service_reference_pt reference, void * service) {
 	celix_status_t status = CELIX_SUCCESS;
-	discovery_t discovery = handle;
+	discovery_pt discovery = handle;
 
 	printf("DISCOVERY: EndpointListener Removed\n");
 	hashMap_remove(discovery->listenerReferences, reference);
@@ -386,7 +386,7 @@ celix_status_t discovery_endpointListene
 }
 
 static void *APR_THREAD_FUNC discovery_pollSLP(apr_thread_t *thd, void *data) {
-	discovery_t discovery = data;
+	discovery_pt discovery = data;
 	SLPHandle slp;
 	SLPError err;
 
@@ -400,11 +400,11 @@ static void *APR_THREAD_FUNC discovery_p
 			err = SLPFindSrvs(slp, "osgi.remote", 0, 0, discovery_pollSLPCallback, data);
 		}
 
-		hash_map_iterator_t iter = hashMapIterator_create(discovery->slpServices);
+		hash_map_iterator_pt iter = hashMapIterator_create(discovery->slpServices);
 		while (hashMapIterator_hasNext(iter)) {
-			hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+			hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
 			char *key = hashMapEntry_getKey(entry);
-			endpoint_description_t value = hashMapEntry_getValue(entry);
+			endpoint_description_pt value = hashMapEntry_getValue(entry);
 
 			bool inUse = false;
 			int i;
@@ -432,7 +432,7 @@ static void *APR_THREAD_FUNC discovery_p
 }
 
 SLPBoolean discovery_pollSLPCallback(SLPHandle hslp, const char* srvurl, unsigned short lifetime, SLPError errcode, void *cookie) {
-	discovery_t discovery = cookie;
+	discovery_pt discovery = cookie;
 	if (errcode == SLP_OK) {
 
 		arrayList_add(discovery->handled, (void *) srvurl);
@@ -445,12 +445,12 @@ SLPBoolean discovery_pollSLPCallback(SLP
 				SLPHandle handle = NULL;
 				SLPError err = SLPOpen("en", SLP_FALSE, &handle);
 				err = SLP_TRUE;
-				slp_service_t slpService = apr_palloc(discovery->pool, sizeof(*slpService));
+				slp_service_pt slpService = apr_palloc(discovery->pool, sizeof(*slpService));
 				while (err == SLP_TRUE) {
 					err = SLPFindAttrs(handle, srvurl, "", "", discovery_attributesCallback, slpService);
 				}
 
-				properties_t props = properties_create();
+				properties_pt props = properties_create();
 				char *track;
 				char *token = apr_strtok(slpService->attributes, ",", &track);
 				while (token != NULL) {
@@ -463,7 +463,7 @@ SLPBoolean discovery_pollSLPCallback(SLP
 					token = apr_strtok(NULL, ",", &track);
 				}
 
-				endpoint_description_t endpoint = apr_palloc(discovery->pool, sizeof(*endpoint));
+				endpoint_description_pt endpoint = apr_palloc(discovery->pool, sizeof(*endpoint));
 				endpoint->id = apr_pstrdup(discovery->pool, url);
 				endpoint->serviceId = 42;
 				endpoint->service = apr_pstrdup(discovery->pool, srv);
@@ -482,7 +482,7 @@ SLPBoolean discovery_pollSLPCallback(SLP
 }
 
 SLPBoolean discovery_attributesCallback(SLPHandle hslp, const char *attributes, SLPError error, void *cookie) {
-	slp_service_t slpService = cookie;
+	slp_service_pt slpService = cookie;
 	if (error == SLP_OK) {
 		slpService->attributes = strdup(attributes);
 	} else if (error == SLP_LAST_CALL) {

Modified: incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c Wed Jun 12 19:08:50 2013
@@ -41,18 +41,18 @@
 
 struct activator {
 	apr_pool_t *pool;
-	bundle_context_t context;
+	bundle_context_pt context;
 
-	discovery_t discovery;
+	discovery_pt discovery;
 
-	service_tracker_t endpointListenerTracker;
-	service_registration_t endpointListenerService;
+	service_tracker_pt endpointListenerTracker;
+	service_registration_pt endpointListenerService;
 };
 
-celix_status_t discoveryActivator_createEPLTracker(struct activator *activator, service_tracker_t *tracker);
+celix_status_t discoveryActivator_createEPLTracker(struct activator *activator, service_tracker_pt *tracker);
 celix_status_t discoveryActivator_getUUID(struct activator *activator, char **uuidStr);
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentPool = NULL;
 	apr_pool_t *pool = NULL;
@@ -79,10 +79,10 @@ celix_status_t bundleActivator_create(bu
 	return status;
 }
 
-celix_status_t discoveryActivator_createEPLTracker(struct activator *activator,  service_tracker_t *tracker) {
+celix_status_t discoveryActivator_createEPLTracker(struct activator *activator,  service_tracker_pt *tracker) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	service_tracker_customizer_t customizer = NULL;
+	service_tracker_customizer_pt customizer = NULL;
 
 	status = serviceTrackerCustomizer_create(activator->pool, activator->discovery, discovery_endpointListenerAdding,
 			discovery_endpointListenerAdded, discovery_endpointListenerModified, discovery_endpointListenerRemoved, &customizer);
@@ -96,18 +96,18 @@ celix_status_t discoveryActivator_create
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	apr_pool_t *pool = NULL;
 	apr_pool_create(&pool, activator->pool);
 
-	endpoint_listener_t endpointListener = apr_palloc(pool, sizeof(*endpointListener));
+	endpoint_listener_pt endpointListener = apr_palloc(pool, sizeof(*endpointListener));
 	endpointListener->handle = activator->discovery;
 	endpointListener->endpointAdded = discovery_endpointAdded;
 	endpointListener->endpointRemoved = discovery_endpointRemoved;
 
-	properties_t props = properties_create();
+	properties_pt props = properties_create();
 	properties_set(props, "DISCOVERY", "true");
 	char *uuid = NULL;
 	discoveryActivator_getUUID(activator, &uuid);
@@ -118,7 +118,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -129,7 +129,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

Modified: incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h (original)
+++ incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h Wed Jun 12 19:08:50 2013
@@ -31,17 +31,17 @@
 #include "properties.h"
 
 struct endpoint_description {
-	array_list_t configurationTypes;
+	array_list_pt configurationTypes;
 	char *frameworkUUID;
 	char *id;
-	// array_list_t intents;
+	// array_list_pt intents;
 	char *service;
 	// HASH_MAP packageVersions;
-	properties_t properties;
+	properties_pt properties;
 	long serviceId;
 };
 
-typedef struct endpoint_description *endpoint_description_t;
+typedef struct endpoint_description *endpoint_description_pt;
 
 static const char * const endpoint_listener_service = "endpoint_listener";
 
@@ -49,11 +49,11 @@ static const char * const ENDPOINT_LISTE
 
 struct endpoint_listener {
 	void *handle;
-	celix_status_t (*endpointAdded)(void *handle, endpoint_description_t endpoint, char *machtedFilter);
-	celix_status_t (*endpointRemoved)(void *handle, endpoint_description_t endpoint, char *machtedFilter);
+	celix_status_t (*endpointAdded)(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
+	celix_status_t (*endpointRemoved)(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
 };
 
-typedef struct endpoint_listener *endpoint_listener_t;
+typedef struct endpoint_listener *endpoint_listener_pt;
 
 
 #endif /* ENDPOINT_LISTENER_H_ */

Modified: incubator/celix/trunk/remote_services/example_endpoint/private/include/example_endpoint_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/private/include/example_endpoint_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/private/include/example_endpoint_impl.h (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/private/include/example_endpoint_impl.h Wed Jun 12 19:08:50 2013
@@ -32,14 +32,14 @@
 #include "celix_errno.h"
 #include "remote_endpoint_impl.h"
 
-celix_status_t exampleEndpoint_create(apr_pool_t *pool, remote_endpoint_t *endpoint);
+celix_status_t exampleEndpoint_create(apr_pool_t *pool, remote_endpoint_pt *endpoint);
 
-celix_status_t exampleEndpoint_setService(remote_endpoint_t endpoint, void *service);
+celix_status_t exampleEndpoint_setService(remote_endpoint_pt endpoint, void *service);
 
-celix_status_t exampleEndpoint_handleRequest(remote_endpoint_t ep, char *request, char *data, char **reply);
+celix_status_t exampleEndpoint_handleRequest(remote_endpoint_pt ep, char *request, char *data, char **reply);
 
-celix_status_t exampleEndpoint_add(remote_endpoint_t ep, char *data, char **reply);
-celix_status_t exampleEndpoint_sub(remote_endpoint_t ep, char *data, char **reply);
-celix_status_t exampleEndpoint_sqrt(remote_endpoint_t ep, char *data, char **reply);
+celix_status_t exampleEndpoint_add(remote_endpoint_pt ep, char *data, char **reply);
+celix_status_t exampleEndpoint_sub(remote_endpoint_pt ep, char *data, char **reply);
+celix_status_t exampleEndpoint_sqrt(remote_endpoint_pt ep, char *data, char **reply);
 
 #endif /* EXAMPLE_ENDPOINT_IMPL_H_ */

Modified: incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c Wed Jun 12 19:08:50 2013
@@ -33,10 +33,10 @@
 struct activator {
 	apr_pool_t *pool;
 
-	service_registration_t endpoint;
+	service_registration_pt endpoint;
 };
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_pool_t *parentPool = NULL;
@@ -63,11 +63,11 @@ celix_status_t bundleActivator_create(bu
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
-	remote_endpoint_t endpoint;
-	remote_endpoint_service_t endpointService;
+	remote_endpoint_pt endpoint;
+	remote_endpoint_service_pt endpointService;
 
 	exampleEndpoint_create(activator->pool, &endpoint);
 	endpointService = apr_palloc(activator->pool, sizeof(*endpointService));
@@ -81,7 +81,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -90,7 +90,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

Modified: incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_impl.c (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_impl.c Wed Jun 12 19:08:50 2013
@@ -31,7 +31,7 @@
 
 #include "example_service.h"
 
-celix_status_t exampleEndpoint_create(apr_pool_t *pool, remote_endpoint_t *endpoint) {
+celix_status_t exampleEndpoint_create(apr_pool_t *pool, remote_endpoint_pt *endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 	*endpoint = apr_palloc(pool, sizeof(**endpoint));
 	if (!*endpoint) {
@@ -44,7 +44,7 @@ celix_status_t exampleEndpoint_create(ap
 	return status;
 }
 
-celix_status_t exampleEndpoint_setService(remote_endpoint_t endpoint, void *service) {
+celix_status_t exampleEndpoint_setService(remote_endpoint_pt endpoint, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
 	endpoint->service = service;
 	return status;
@@ -53,7 +53,7 @@ celix_status_t exampleEndpoint_setServic
 /**
  * Request: http://host:port/services/{service}/{request}
  */
-celix_status_t exampleEndpoint_handleRequest(remote_endpoint_t ep, char *request, char *data, char **reply) {
+celix_status_t exampleEndpoint_handleRequest(remote_endpoint_pt ep, char *request, char *data, char **reply) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	printf("EXAMPLE ENDPOINT: Handle request \"%s\" with data \"%s\"\n", request, data);
@@ -74,7 +74,7 @@ celix_status_t exampleEndpoint_handleReq
  * data = { "a" : 1.1, "b" : 2.4 }
  * reply = 3.5
  */
-celix_status_t exampleEndpoint_add(remote_endpoint_t ep, char *data, char **reply) {
+celix_status_t exampleEndpoint_add(remote_endpoint_pt ep, char *data, char **reply) {
 	celix_status_t status = CELIX_SUCCESS;
 	json_error_t jsonError;
 	json_t *root;
@@ -90,7 +90,7 @@ celix_status_t exampleEndpoint_add(remot
 		if (ep->service != NULL) {
 			double result;
 			json_t *resultRoot;
-			example_service_t service = ep->service;
+			example_service_pt service = ep->service;
 			service->add(service->example, a, b, &result);
 			resultRoot = json_pack("{s:f}", "result", result);
 
@@ -105,7 +105,7 @@ celix_status_t exampleEndpoint_add(remot
 	return status;
 }
 
-celix_status_t exampleEndpoint_sub(remote_endpoint_t ep, char *data, char **reply) {
+celix_status_t exampleEndpoint_sub(remote_endpoint_pt ep, char *data, char **reply) {
 	celix_status_t status = CELIX_SUCCESS;
 	json_error_t jsonError;
 	json_t *root;
@@ -121,7 +121,7 @@ celix_status_t exampleEndpoint_sub(remot
 		if (ep->service != NULL) {
 			double result;
 			json_t *resultRoot;
-			example_service_t service = ep->service;
+			example_service_pt service = ep->service;
 			service->sub(service->example, a, b, &result);
 			resultRoot = json_pack("{s:f}", "result", result);
 
@@ -136,7 +136,7 @@ celix_status_t exampleEndpoint_sub(remot
 	return status;
 }
 
-celix_status_t exampleEndpoint_sqrt(remote_endpoint_t ep, char *data, char **reply) {
+celix_status_t exampleEndpoint_sqrt(remote_endpoint_pt ep, char *data, char **reply) {
 	celix_status_t status = CELIX_SUCCESS;
 	json_error_t jsonError;
 	json_t *root;
@@ -151,7 +151,7 @@ celix_status_t exampleEndpoint_sqrt(remo
 		if (ep->service != NULL) {
 			double result;
 			json_t *resultRoot;
-			example_service_t service = ep->service;
+			example_service_pt service = ep->service;
 			service->sqrt(service->example, a, &result);
 			resultRoot = json_pack("{s:f}", "result", result);
 

Modified: incubator/celix/trunk/remote_services/example_proxy/private/include/example_proxy_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/private/include/example_proxy_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/private/include/example_proxy_impl.h (original)
+++ incubator/celix/trunk/remote_services/example_proxy/private/include/example_proxy_impl.h Wed Jun 12 19:08:50 2013
@@ -38,14 +38,14 @@
 
 struct example {
 	apr_pool_t *pool;
-	endpoint_description_t endpoint;
+	endpoint_description_pt endpoint;
 };
 
-celix_status_t exampleProxy_create(apr_pool_t *pool, example_t *example);
-celix_status_t exampleProxy_add(example_t example, double a, double b, double *result);
-celix_status_t exampleProxy_sub(example_t example, double a, double b, double *result);
-celix_status_t exampleProxy_sqrt(example_t example, double a, double *result);
+celix_status_t exampleProxy_create(apr_pool_t *pool, example_pt *example);
+celix_status_t exampleProxy_add(example_pt example, double a, double b, double *result);
+celix_status_t exampleProxy_sub(example_pt example, double a, double b, double *result);
+celix_status_t exampleProxy_sqrt(example_pt example, double a, double *result);
 
-celix_status_t exampleProxy_setEndpointDescription(void *proxy, endpoint_description_t endpoint);
+celix_status_t exampleProxy_setEndpointDescription(void *proxy, endpoint_description_pt endpoint);
 
 #endif /* EXAMPLE_PROXY_IMPL_H_ */

Modified: incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c (original)
+++ incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c Wed Jun 12 19:08:50 2013
@@ -34,11 +34,11 @@
 struct activator {
 	apr_pool_t *pool;
 
-	service_registration_t proxy;
-	service_registration_t service;
+	service_registration_pt proxy;
+	service_registration_pt service;
 };
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	apr_pool_t *parentPool = NULL;
@@ -66,12 +66,12 @@ celix_status_t bundleActivator_create(bu
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
-	example_t example;
-	example_service_t exampleService;
-	remote_proxy_service_t exampleProxy;
+	example_pt example;
+	example_service_pt exampleService;
+	remote_proxy_service_pt exampleProxy;
 
 	exampleProxy_create(activator->pool, &example);
 	exampleService = apr_palloc(activator->pool, sizeof(*exampleService));
@@ -89,14 +89,14 @@ celix_status_t bundleActivator_start(voi
 
 	bundleContext_registerService(context, EXAMPLE_SERVICE, exampleService, NULL, &activator->service);
 
-	properties_t props = properties_create();
+	properties_pt props = properties_create();
 	properties_set(props, (char *) "proxy.interface", (char *) EXAMPLE_SERVICE);
 	bundleContext_registerService(context, REMOTE_PROXY, exampleProxy, props, &activator->proxy);
 
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -108,7 +108,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }

Modified: incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c (original)
+++ incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c Wed Jun 12 19:08:50 2013
@@ -46,11 +46,11 @@ struct get {
 	int size;
 };
 
-celix_status_t exampleProxy_postRequest(example_t example, char *url, struct post post, struct get *get);
+celix_status_t exampleProxy_postRequest(example_pt example, char *url, struct post post, struct get *get);
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp);
 static size_t exampleProxy_write(void *contents, size_t size, size_t nmemb, void *userp);
 
-celix_status_t exampleProxy_create(apr_pool_t *pool, example_t *endpoint) {
+celix_status_t exampleProxy_create(apr_pool_t *pool, example_pt *endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 	*endpoint = apr_palloc(pool, sizeof(**endpoint));
 	if (!*endpoint) {
@@ -63,7 +63,7 @@ celix_status_t exampleProxy_create(apr_p
 	return status;
 }
 
-celix_status_t exampleProxy_add(example_t example, double a, double b, double *result) {
+celix_status_t exampleProxy_add(example_pt example, double a, double b, double *result) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (example->endpoint != NULL) {
@@ -95,7 +95,7 @@ celix_status_t exampleProxy_add(example_
 	return status;
 }
 
-celix_status_t exampleProxy_sub(example_t example, double a, double b, double *result) {
+celix_status_t exampleProxy_sub(example_pt example, double a, double b, double *result) {
 	celix_status_t status = CELIX_SUCCESS;
 	if (example->endpoint != NULL) {
 		printf("CALCULATOR_PROXY: URL: %s\n", example->endpoint->id);
@@ -126,7 +126,7 @@ celix_status_t exampleProxy_sub(example_
 	return status;
 }
 
-celix_status_t exampleProxy_sqrt(example_t example, double a, double *result) {
+celix_status_t exampleProxy_sqrt(example_pt example, double a, double *result) {
 	celix_status_t status = CELIX_SUCCESS;
 	if (example->endpoint != NULL) {
 		printf("CALCULATOR_PROXY: URL: %s\n", example->endpoint->id);
@@ -157,7 +157,7 @@ celix_status_t exampleProxy_sqrt(example
 	return status;
 }
 
-celix_status_t exampleProxy_postRequest(example_t example, char *url, struct post post, struct get *get) {
+celix_status_t exampleProxy_postRequest(example_pt example, char *url, struct post post, struct get *get) {
 	celix_status_t status = CELIX_SUCCESS;
 	CURL *curl;
 	CURLcode res;
@@ -213,10 +213,10 @@ static size_t exampleProxy_write(void *c
   return realsize;
 }
 
-celix_status_t exampleProxy_setEndpointDescription(void *proxy, endpoint_description_t endpoint) {
+celix_status_t exampleProxy_setEndpointDescription(void *proxy, endpoint_description_pt endpoint) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	example_t example = proxy;
+	example_pt example = proxy;
 	example->endpoint = endpoint;
 
 	return status;

Modified: incubator/celix/trunk/remote_services/example_service/private/include/example_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/private/include/example_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/private/include/example_impl.h (original)
+++ incubator/celix/trunk/remote_services/example_service/private/include/example_impl.h Wed Jun 12 19:08:50 2013
@@ -37,9 +37,9 @@ struct example {
 	apr_pool_t *pool;
 };
 
-celix_status_t example_create(apr_pool_t *pool, example_t *example);
-celix_status_t example_add(example_t example, double a, double b, double *result);
-celix_status_t example_sub(example_t example, double a, double b, double *result);
-celix_status_t example_sqrt(example_t example, double a, double *result);
+celix_status_t example_create(apr_pool_t *pool, example_pt *example);
+celix_status_t example_add(example_pt example, double a, double b, double *result);
+celix_status_t example_sub(example_pt example, double a, double b, double *result);
+celix_status_t example_sqrt(example_pt example, double a, double *result);
 
 #endif /* EXAMPLE_IMPL_H_ */

Modified: incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c (original)
+++ incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c Wed Jun 12 19:08:50 2013
@@ -34,10 +34,10 @@
 
 struct activator {
 	apr_pool_t *pool;
-	service_registration_t exampleReg;
+	service_registration_pt exampleReg;
 };
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentpool = NULL;
 	apr_pool_t *pool = NULL;
@@ -59,12 +59,12 @@ celix_status_t bundleActivator_create(bu
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
-	example_t example = NULL;
-	example_service_t service = NULL;
-	properties_t properties = NULL;
+	example_pt example = NULL;
+	example_service_pt service = NULL;
+	properties_pt properties = NULL;
 
 	status = example_create(activator->pool, &example);
 	if (status == CELIX_SUCCESS) {
@@ -87,7 +87,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -96,7 +96,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 

Modified: incubator/celix/trunk/remote_services/example_service/private/src/example_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/private/src/example_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/private/src/example_impl.c (original)
+++ incubator/celix/trunk/remote_services/example_service/private/src/example_impl.c Wed Jun 12 19:08:50 2013
@@ -29,7 +29,7 @@
 
 #include "example_impl.h"
 
-celix_status_t example_create(apr_pool_t *pool, example_t *example) {
+celix_status_t example_create(apr_pool_t *pool, example_pt *example) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*example = apr_palloc(pool, sizeof(**example));
@@ -42,7 +42,7 @@ celix_status_t example_create(apr_pool_t
 	return status;
 }
 
-celix_status_t example_add(example_t example, double a, double b, double *result) {
+celix_status_t example_add(example_pt example, double a, double b, double *result) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*result = a + b;
@@ -51,7 +51,7 @@ celix_status_t example_add(example_t exa
 	return status;
 }
 
-celix_status_t example_sub(example_t example, double a, double b, double *result) {
+celix_status_t example_sub(example_pt example, double a, double b, double *result) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	*result = a - b;
@@ -60,7 +60,7 @@ celix_status_t example_sub(example_t exa
 	return status;
 }
 
-celix_status_t example_sqrt(example_t example, double a, double *result) {
+celix_status_t example_sqrt(example_pt example, double a, double *result) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (a > 0) {

Modified: incubator/celix/trunk/remote_services/example_service/public/include/example_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/public/include/example_service.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/public/include/example_service.h (original)
+++ incubator/celix/trunk/remote_services/example_service/public/include/example_service.h Wed Jun 12 19:08:50 2013
@@ -29,15 +29,15 @@
 
 #define EXAMPLE_SERVICE "example"
 
-typedef struct example *example_t;
+typedef struct example *example_pt;
 
-typedef struct example_service *example_service_t;
+typedef struct example_service *example_service_pt;
 
 struct example_service {
-	example_t example;
-	celix_status_t (*add)(example_t example, double a, double b, double *result);
-	celix_status_t (*sub)(example_t example, double a, double b, double *result);
-	celix_status_t (*sqrt)(example_t example, double a, double *result);
+	example_pt example;
+	celix_status_t (*add)(example_pt example, double a, double b, double *result);
+	celix_status_t (*sub)(example_pt example, double a, double b, double *result);
+	celix_status_t (*sqrt)(example_pt example, double a, double *result);
 };
 
 #endif /* EXAMPLE_SERVICE_H_ */

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h Wed Jun 12 19:08:50 2013
@@ -33,30 +33,30 @@
 
 struct export_registration {
 	apr_pool_t *pool;
-	bundle_context_t context;
-	remote_service_admin_t rsa;
-	endpoint_description_t endpointDescription;
-	service_reference_t reference;
+	bundle_context_pt context;
+	remote_service_admin_pt rsa;
+	endpoint_description_pt endpointDescription;
+	service_reference_pt reference;
 
-	service_tracker_t tracker;
-	service_tracker_t endpointTracker;
+	service_tracker_pt tracker;
+	service_tracker_pt endpointTracker;
 
-	remote_endpoint_service_t endpoint;
+	remote_endpoint_service_pt endpoint;
 
-	export_reference_t exportReference;
-	bundle_t bundle;
+	export_reference_pt exportReference;
+	bundle_pt bundle;
 
 	bool closed;
 };
 
-celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_t reference, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, export_registration_t *registration);
-celix_status_t exportRegistration_open(export_registration_t registration);
-celix_status_t exportRegistration_close(export_registration_t registration);
-celix_status_t exportRegistration_getException(export_registration_t registration);
-celix_status_t exportRegistration_getExportReference(export_registration_t registration, export_reference_t *reference);
-
-celix_status_t exportRegistration_setEndpointDescription(export_registration_t registration, endpoint_description_t endpointDescription);
-celix_status_t exportRegistration_startTracking(export_registration_t registration);
-celix_status_t exportRegistration_stopTracking(export_registration_t registration);
+celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_pt reference, endpoint_description_pt endpoint, remote_service_admin_pt rsa, bundle_context_pt context, export_registration_pt *registration);
+celix_status_t exportRegistration_open(export_registration_pt registration);
+celix_status_t exportRegistration_close(export_registration_pt registration);
+celix_status_t exportRegistration_getException(export_registration_pt registration);
+celix_status_t exportRegistration_getExportReference(export_registration_pt registration, export_reference_pt *reference);
+
+celix_status_t exportRegistration_setEndpointDescription(export_registration_pt registration, endpoint_description_pt endpointDescription);
+celix_status_t exportRegistration_startTracking(export_registration_pt registration);
+celix_status_t exportRegistration_stopTracking(export_registration_pt registration);
 
 #endif /* EXPORT_REGISTRATION_IMPL_H_ */

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h Wed Jun 12 19:08:50 2013
@@ -33,28 +33,28 @@
 
 struct import_registration {
 	apr_pool_t *pool;
-	bundle_context_t context;
-	remote_service_admin_t rsa;
-	endpoint_description_t endpointDescription;
-
-	service_tracker_t proxyTracker;
-
-	service_reference_t reference;
-	remote_proxy_service_t proxy;
-	import_reference_t importReference;
-	bundle_t bundle;
+	bundle_context_pt context;
+	remote_service_admin_pt rsa;
+	endpoint_description_pt endpointDescription;
+
+	service_tracker_pt proxyTracker;
+
+	service_reference_pt reference;
+	remote_proxy_service_pt proxy;
+	import_reference_pt importReference;
+	bundle_pt bundle;
 
 	bool closed;
 };
 
-celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, import_registration_t *registration);
-celix_status_t importRegistration_open(import_registration_t registration);
-celix_status_t importRegistration_close(import_registration_t registration);
-celix_status_t importRegistration_getException(import_registration_t registration);
-celix_status_t importRegistration_getImportReference(import_registration_t registration, import_reference_t *reference);
-
-celix_status_t importRegistration_setEndpointDescription(import_registration_t registration, endpoint_description_t endpointDescription);
-celix_status_t importRegistration_startTracking(import_registration_t registration);
-celix_status_t importRegistration_stopTracking(import_registration_t registration);
+celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_pt endpoint, remote_service_admin_pt rsa, bundle_context_pt context, import_registration_pt *registration);
+celix_status_t importRegistration_open(import_registration_pt registration);
+celix_status_t importRegistration_close(import_registration_pt registration);
+celix_status_t importRegistration_getException(import_registration_pt registration);
+celix_status_t importRegistration_getImportReference(import_registration_pt registration, import_reference_pt *reference);
+
+celix_status_t importRegistration_setEndpointDescription(import_registration_pt registration, endpoint_description_pt endpointDescription);
+celix_status_t importRegistration_startTracking(import_registration_pt registration);
+celix_status_t importRegistration_stopTracking(import_registration_pt registration);
 
 #endif /* IMPORT_REGISTRATION_IMPL_H_ */

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/mongoose.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/mongoose.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/mongoose.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/mongoose.h Wed Jun 12 19:08:50 2013
@@ -76,7 +76,7 @@ enum mg_event {
 //   If callback returns NULL, that means that callback has not processed
 //   the request. Handler must not send any data to the client in this case.
 //   Mongoose proceeds with request handling as if nothing happened.
-typedef void * (*mg_callback_t)(enum mg_event event,
+typedef void * (*mg_callback_pt)(enum mg_event event,
                                 struct mg_connection *conn,
                                 const struct mg_request_info *request_info);
 
@@ -106,7 +106,7 @@ typedef void * (*mg_callback_t)(enum mg_
 //
 // Return:
 //   web server context, or NULL on error.
-struct mg_context *mg_start(mg_callback_t callback, void *user_data,
+struct mg_context *mg_start(mg_callback_pt callback, void *user_data,
                             const char **options);
 
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h Wed Jun 12 19:08:50 2013
@@ -34,38 +34,38 @@
 #define DEFAULT_BUNDLE_STORE "rs_bundles"
 
 struct export_reference {
-	endpoint_description_t endpoint;
-	service_reference_t reference;
+	endpoint_description_pt endpoint;
+	service_reference_pt reference;
 };
 
 struct import_reference {
-	endpoint_description_t endpoint;
-	service_reference_t reference;
+	endpoint_description_pt endpoint;
+	service_reference_pt reference;
 };
 
 struct remote_service_admin {
 	apr_pool_t *pool;
-	bundle_context_t context;
+	bundle_context_pt context;
 
-	hash_map_t exportedServices;
-	hash_map_t importedServices;
+	hash_map_pt exportedServices;
+	hash_map_pt importedServices;
 
 	struct mg_context *ctx;
 };
 
-celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin);
-celix_status_t remoteServiceAdmin_stop(remote_service_admin_t admin);
+celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_pt *admin);
+celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin);
 
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations);
-celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, array_list_t *services);
-celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, array_list_t *services);
-celix_status_t remoteServiceAdmin_importService(remote_service_admin_t admin, endpoint_description_t endpoint, import_registration_t *registration);
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, service_reference_pt reference, properties_pt properties, array_list_pt *registrations);
+celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_pt admin, array_list_pt *services);
+celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_pt admin, array_list_pt *services);
+celix_status_t remoteServiceAdmin_importService(remote_service_admin_pt admin, endpoint_description_pt endpoint, import_registration_pt *registration);
 
 
-celix_status_t exportReference_getExportedEndpoint(export_reference_t reference, endpoint_description_t *endpoint);
-celix_status_t exportReference_getExportedService(export_reference_t reference);
+celix_status_t exportReference_getExportedEndpoint(export_reference_pt reference, endpoint_description_pt *endpoint);
+celix_status_t exportReference_getExportedService(export_reference_pt reference);
 
-celix_status_t importReference_getImportedEndpoint(import_reference_t reference);
-celix_status_t importReference_getImportedService(import_reference_t reference);
+celix_status_t importReference_getImportedEndpoint(import_reference_pt reference);
+celix_status_t importReference_getImportedService(import_reference_pt reference);
 
 #endif /* REMOTE_SERVICE_ADMIN_IMPL_H_ */

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c Wed Jun 12 19:08:50 2013
@@ -37,14 +37,14 @@
 #include "bundle.h"
 #include "celix_log.h"
 
-celix_status_t exportRegistration_endpointAdding(void * handle, service_reference_t reference, void **service);
-celix_status_t exportRegistration_endpointAdded(void * handle, service_reference_t reference, void *service);
-celix_status_t exportRegistration_endpointModified(void * handle, service_reference_t reference, void *service);
-celix_status_t exportRegistration_endpointRemoved(void * handle, service_reference_t reference, void *service);
+celix_status_t exportRegistration_endpointAdding(void * handle, service_reference_pt reference, void **service);
+celix_status_t exportRegistration_endpointAdded(void * handle, service_reference_pt reference, void *service);
+celix_status_t exportRegistration_endpointModified(void * handle, service_reference_pt reference, void *service);
+celix_status_t exportRegistration_endpointRemoved(void * handle, service_reference_pt reference, void *service);
 
-celix_status_t exportRegistration_createEndpointTracker(export_registration_t registration, service_tracker_t *tracker);
+celix_status_t exportRegistration_createEndpointTracker(export_registration_pt registration, service_tracker_pt *tracker);
 
-celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_t reference, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, export_registration_t *registration) {
+celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_pt reference, endpoint_description_pt endpoint, remote_service_admin_pt rsa, bundle_context_pt context, export_registration_pt *registration) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);
@@ -69,7 +69,7 @@ celix_status_t exportRegistration_create
 	return status;
 }
 
-celix_status_t exportRegistration_startTracking(export_registration_t registration) {
+celix_status_t exportRegistration_startTracking(export_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (registration->endpointTracker == NULL) {
@@ -82,7 +82,7 @@ celix_status_t exportRegistration_startT
 	return status;
 }
 
-celix_status_t exportRegistration_stopTracking(export_registration_t registration) {
+celix_status_t exportRegistration_stopTracking(export_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (registration->endpointTracker != NULL) {
@@ -101,10 +101,10 @@ celix_status_t exportRegistration_stopTr
 	return status;
 }
 
-celix_status_t exportRegistration_createEndpointTracker(export_registration_t registration, service_tracker_t *tracker) {
+celix_status_t exportRegistration_createEndpointTracker(export_registration_pt registration, service_tracker_pt *tracker) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	service_tracker_customizer_t customizer = NULL;
+	service_tracker_customizer_pt customizer = NULL;
 
 	status = serviceTrackerCustomizer_create(registration->pool, registration, exportRegistration_endpointAdding,
 			exportRegistration_endpointAdded, exportRegistration_endpointModified, exportRegistration_endpointRemoved, &customizer);
@@ -116,20 +116,20 @@ celix_status_t exportRegistration_create
 	return status;
 }
 
-celix_status_t exportRegistration_endpointAdding(void * handle, service_reference_t reference, void **service) {
+celix_status_t exportRegistration_endpointAdding(void * handle, service_reference_pt reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
-	export_registration_t registration = handle;
+	export_registration_pt registration = handle;
 
 	status = bundleContext_getService(registration->context, reference, service);
 
 	return status;
 }
 
-celix_status_t exportRegistration_endpointAdded(void * handle, service_reference_t reference, void *service) {
+celix_status_t exportRegistration_endpointAdded(void * handle, service_reference_pt reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	export_registration_t registration = handle;
+	export_registration_pt registration = handle;
 
-	remote_endpoint_service_t endpoint = service;
+	remote_endpoint_service_pt endpoint = service;
 	if (registration->endpoint == NULL) {
 		registration->endpoint = endpoint;
 		void *service = NULL;
@@ -142,18 +142,18 @@ celix_status_t exportRegistration_endpoi
 	return status;
 }
 
-celix_status_t exportRegistration_endpointModified(void * handle, service_reference_t reference, void *service) {
+celix_status_t exportRegistration_endpointModified(void * handle, service_reference_pt reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	export_registration_t registration = handle;
+	export_registration_pt registration = handle;
 
 	return status;
 }
 
-celix_status_t exportRegistration_endpointRemoved(void * handle, service_reference_t reference, void *service) {
+celix_status_t exportRegistration_endpointRemoved(void * handle, service_reference_pt reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	export_registration_t registration = handle;
+	export_registration_pt registration = handle;
 
-	remote_endpoint_service_t endpoint = service;
+	remote_endpoint_service_pt endpoint = service;
 	if (registration->endpoint != NULL) {
 		registration->endpoint = NULL;
 		endpoint->setService(endpoint->endpoint, NULL);
@@ -162,7 +162,7 @@ celix_status_t exportRegistration_endpoi
 	return status;
 }
 
-celix_status_t exportRegistration_open(export_registration_t registration) {
+celix_status_t exportRegistration_open(export_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	char *bundleStore = NULL;
@@ -181,7 +181,7 @@ celix_status_t exportRegistration_open(e
 	return status;
 }
 
-celix_status_t exportRegistration_close(export_registration_t registration) {
+celix_status_t exportRegistration_close(export_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	exportRegistration_stopTracking(registration);
@@ -192,12 +192,12 @@ celix_status_t exportRegistration_close(
 	return status;
 }
 
-celix_status_t exportRegistration_getException(export_registration_t registration) {
+celix_status_t exportRegistration_getException(export_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
 
-celix_status_t exportRegistration_getExportReference(export_registration_t registration, export_reference_t *reference) {
+celix_status_t exportRegistration_getExportReference(export_registration_pt registration, export_reference_pt *reference) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (registration->exportReference == NULL) {
@@ -215,7 +215,7 @@ celix_status_t exportRegistration_getExp
 	return status;
 }
 
-celix_status_t exportRegistration_setEndpointDescription(export_registration_t registration, endpoint_description_t endpointDescription) {
+celix_status_t exportRegistration_setEndpointDescription(export_registration_pt registration, endpoint_description_pt endpointDescription) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	registration->endpointDescription = endpointDescription;

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c Wed Jun 12 19:08:50 2013
@@ -39,14 +39,14 @@
 #include "bundle_context.h"
 #include "bundle.h"
 
-celix_status_t importRegistration_proxyAdding(void * handle, service_reference_t reference, void **service);
-celix_status_t importRegistration_proxyAdded(void * handle, service_reference_t reference, void *service);
-celix_status_t importRegistration_proxyModified(void * handle, service_reference_t reference, void *service);
-celix_status_t importRegistration_proxyRemoved(void * handle, service_reference_t reference, void *service);
+celix_status_t importRegistration_proxyAdding(void * handle, service_reference_pt reference, void **service);
+celix_status_t importRegistration_proxyAdded(void * handle, service_reference_pt reference, void *service);
+celix_status_t importRegistration_proxyModified(void * handle, service_reference_pt reference, void *service);
+celix_status_t importRegistration_proxyRemoved(void * handle, service_reference_pt reference, void *service);
 
-celix_status_t importRegistration_createProxyTracker(import_registration_t registration, service_tracker_t *tracker);
+celix_status_t importRegistration_createProxyTracker(import_registration_pt registration, service_tracker_pt *tracker);
 
-celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_t endpoint, remote_service_admin_t rsa, bundle_context_t context, import_registration_t *registration) {
+celix_status_t importRegistration_create(apr_pool_t *pool, endpoint_description_pt endpoint, remote_service_admin_pt rsa, bundle_context_pt context, import_registration_pt *registration) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);
@@ -70,7 +70,7 @@ celix_status_t importRegistration_create
 	return status;
 }
 
-celix_status_t importRegistration_startTracking(import_registration_t registration) {
+celix_status_t importRegistration_startTracking(import_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (registration->proxyTracker == NULL) {
@@ -81,7 +81,7 @@ celix_status_t importRegistration_startT
 	return status;
 }
 
-celix_status_t importRegistration_stopTracking(import_registration_t registration) {
+celix_status_t importRegistration_stopTracking(import_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (registration->proxyTracker != NULL) {
@@ -91,10 +91,10 @@ celix_status_t importRegistration_stopTr
 	return status;
 }
 
-celix_status_t importRegistration_createProxyTracker(import_registration_t registration, service_tracker_t *tracker) {
+celix_status_t importRegistration_createProxyTracker(import_registration_pt registration, service_tracker_pt *tracker) {
 	celix_status_t status = CELIX_SUCCESS;
 
-	service_tracker_customizer_t customizer = NULL;
+	service_tracker_customizer_pt customizer = NULL;
 
 	status = serviceTrackerCustomizer_create(registration->pool, registration, importRegistration_proxyAdding,
 			importRegistration_proxyAdded, importRegistration_proxyModified, importRegistration_proxyRemoved, &customizer);
@@ -108,20 +108,20 @@ celix_status_t importRegistration_create
 	return status;
 }
 
-celix_status_t importRegistration_proxyAdding(void * handle, service_reference_t reference, void **service) {
+celix_status_t importRegistration_proxyAdding(void * handle, service_reference_pt reference, void **service) {
 	celix_status_t status = CELIX_SUCCESS;
-	import_registration_t registration = handle;
+	import_registration_pt registration = handle;
 
 	bundleContext_getService(registration->context, reference, service);
 
 	return status;
 }
 
-celix_status_t importRegistration_proxyAdded(void * handle, service_reference_t reference, void *service) {
+celix_status_t importRegistration_proxyAdded(void * handle, service_reference_pt reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	import_registration_t registration = handle;
+	import_registration_pt registration = handle;
 
-	remote_proxy_service_t proxy = service;
+	remote_proxy_service_pt proxy = service;
 	if (registration->proxy == NULL) {
 		registration->reference = reference;
 		registration->proxy = proxy;
@@ -133,11 +133,11 @@ celix_status_t importRegistration_proxyA
 	return status;
 }
 
-celix_status_t importRegistration_proxyModified(void * handle, service_reference_t reference, void *service) {
+celix_status_t importRegistration_proxyModified(void * handle, service_reference_pt reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	import_registration_t registration = handle;
+	import_registration_pt registration = handle;
 
-	//remote_proxy_service_t endpoint = service;
+	//remote_proxy_service_pt endpoint = service;
 	//if (registration->endpoint != NULL) {
 	//	registration->endpoint = endpoint;
 	//	endpoint->setServiceReference(endpoint->endpoint, registration->reference);
@@ -146,11 +146,11 @@ celix_status_t importRegistration_proxyM
 	return status;
 }
 
-celix_status_t importRegistration_proxyRemoved(void * handle, service_reference_t reference, void *service) {
+celix_status_t importRegistration_proxyRemoved(void * handle, service_reference_pt reference, void *service) {
 	celix_status_t status = CELIX_SUCCESS;
-	import_registration_t registration = handle;
+	import_registration_pt registration = handle;
 
-	remote_proxy_service_t proxy = service;
+	remote_proxy_service_pt proxy = service;
 	if (registration->proxy != NULL) {
 		registration->reference = NULL;
 		registration->proxy = NULL;
@@ -160,7 +160,7 @@ celix_status_t importRegistration_proxyR
 	return status;
 }
 
-celix_status_t importRegistration_open(import_registration_t registration) {
+celix_status_t importRegistration_open(import_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	char *bundleStore = NULL;
@@ -179,7 +179,7 @@ celix_status_t importRegistration_open(i
 	return status;
 }
 
-celix_status_t importRegistration_close(import_registration_t registration) {
+celix_status_t importRegistration_close(import_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	importRegistration_stopTracking(registration);
@@ -192,12 +192,12 @@ celix_status_t importRegistration_close(
 	return status;
 }
 
-celix_status_t importRegistration_getException(import_registration_t registration) {
+celix_status_t importRegistration_getException(import_registration_pt registration) {
 	celix_status_t status = CELIX_SUCCESS;
 	return status;
 }
 
-celix_status_t importRegistration_getImportReference(import_registration_t registration, import_reference_t *reference) {
+celix_status_t importRegistration_getImportReference(import_registration_pt registration, import_reference_pt *reference) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (registration->importReference == NULL) {
@@ -215,7 +215,7 @@ celix_status_t importRegistration_getImp
 	return status;
 }
 
-celix_status_t importRegistration_setEndpointDescription(import_registration_t registration, endpoint_description_t endpointDescription) {
+celix_status_t importRegistration_setEndpointDescription(import_registration_pt registration, endpoint_description_pt endpointDescription) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	registration->endpointDescription = endpointDescription;

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/mongoose.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/mongoose.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/mongoose.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/mongoose.c Wed Jun 12 19:08:50 2013
@@ -247,7 +247,7 @@ static pthread_t pthread_self(void) {
 typedef int socklen_t;
 #endif // NO_SOCKLEN_T
 
-typedef void * (*mg_thread_func_t)(void *);
+typedef void * (*mg_thread_func_pt)(void *);
 
 static const char *http_500_error = "Internal Server Error";
 
@@ -279,7 +279,7 @@ extern void SSL_load_error_strings(void)
 extern int SSL_CTX_use_PrivateKey_file(SSL_CTX *, const char *, int);
 extern int SSL_CTX_use_certificate_file(SSL_CTX *, const char *, int);
 extern int SSL_CTX_use_certificate_chain_file(SSL_CTX *, const char *);
-extern void SSL_CTX_set_default_passwd_cb(SSL_CTX *, mg_callback_t);
+extern void SSL_CTX_set_default_passwd_cb(SSL_CTX *, mg_callback_pt);
 extern void SSL_CTX_free(SSL_CTX *);
 extern unsigned long ERR_get_error(void);
 extern char *ERR_error_string(unsigned long, char *);
@@ -309,7 +309,7 @@ struct ssl_func {
 #define SSL_CTX_use_certificate_file (* (int (*)(SSL_CTX *, \
         const char *, int)) ssl_sw[12].ptr)
 #define SSL_CTX_set_default_passwd_cb \
-  (* (void (*)(SSL_CTX *, mg_callback_t)) ssl_sw[13].ptr)
+  (* (void (*)(SSL_CTX *, mg_callback_pt)) ssl_sw[13].ptr)
 #define SSL_CTX_free (* (void (*)(SSL_CTX *)) ssl_sw[14].ptr)
 #define SSL_load_error_strings (* (void (*)(void)) ssl_sw[15].ptr)
 #define SSL_CTX_use_certificate_chain_file \
@@ -440,7 +440,7 @@ struct mg_context {
   volatile int stop_flag;       // Should we stop event loop
   SSL_CTX *ssl_ctx;             // SSL context
   char *config[NUM_OPTIONS];    // Mongoose configuration parameters
-  mg_callback_t user_callback;  // User-defined callback function
+  mg_callback_pt user_callback;  // User-defined callback function
   void *user_data;              // User-defined data
 
   struct socket *listening_sockets;
@@ -1106,7 +1106,7 @@ struct dirent * readdir(DIR *dir) {
 
 #define set_close_on_exec(fd) // No FD_CLOEXEC on Windows
 
-static int start_thread(struct mg_context *ctx, mg_thread_func_t f, void *p) {
+static int start_thread(struct mg_context *ctx, mg_thread_func_pt f, void *p) {
   return _beginthread((void (__cdecl *)(void *)) f, 0, p) == -1L ? -1 : 0;
 }
 
@@ -1219,7 +1219,7 @@ static void set_close_on_exec(int fd) {
   (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
 }
 
-static int start_thread(struct mg_context *ctx, mg_thread_func_t func,
+static int start_thread(struct mg_context *ctx, mg_thread_func_pt func,
                         void *param) {
   pthread_t thread_id;
   pthread_attr_t attr;
@@ -4172,7 +4172,7 @@ void mg_stop(struct mg_context *ctx) {
 #endif // _WIN32
 }
 
-struct mg_context *mg_start(mg_callback_t user_callback, void *user_data,
+struct mg_context *mg_start(mg_callback_pt user_callback, void *user_data,
                             const char **options) {
   struct mg_context *ctx;
   const char *name, *value, *default_value;
@@ -4243,11 +4243,11 @@ struct mg_context *mg_start(mg_callback_
   (void) pthread_cond_init(&ctx->sq_full, NULL);
 
   // Start master (listening) thread
-  start_thread(ctx, (mg_thread_func_t) master_thread, ctx);
+  start_thread(ctx, (mg_thread_func_pt) master_thread, ctx);
 
   // Start worker threads
   for (i = 0; i < atoi(ctx->config[NUM_THREADS]); i++) {
-    if (start_thread(ctx, (mg_thread_func_t) worker_thread, ctx) != 0) {
+    if (start_thread(ctx, (mg_thread_func_pt) worker_thread, ctx) != 0) {
       cry(fc(ctx), "Cannot start worker thread: %d", ERRNO);
     } else {
       ctx->num_threads++;

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c Wed Jun 12 19:08:50 2013
@@ -34,11 +34,11 @@
 
 struct activator {
 	apr_pool_t *pool;
-	remote_service_admin_t admin;
-	service_registration_t registration;
+	remote_service_admin_pt admin;
+	service_registration_pt registration;
 };
 
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *parentPool = NULL;
 	apr_pool_t *pool = NULL;
@@ -65,10 +65,10 @@ celix_status_t bundleActivator_create(bu
 	return status;
 }
 
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
-	remote_service_admin_service_t remoteServiceAdmin = NULL;
+	remote_service_admin_service_pt remoteServiceAdmin = NULL;
 
 	status = remoteServiceAdmin_create(activator->pool, context, &activator->admin);
 	if (status == CELIX_SUCCESS) {
@@ -103,7 +103,7 @@ celix_status_t bundleActivator_start(voi
 	return status;
 }
 
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 
@@ -115,7 +115,7 @@ celix_status_t bundleActivator_stop(void
 	return status;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
 	celix_status_t status = CELIX_SUCCESS;
 	struct activator *activator = userData;
 	return status;



Mime
View raw message