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 [8/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/framework/public/include/service_registry.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_registry.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_registry.h (original)
+++ incubator/celix/trunk/framework/public/include/service_registry.h Wed Jun 12 19:08:50 2013
@@ -29,7 +29,7 @@
 
 #include <apr_general.h>
 
-typedef struct serviceRegistry * service_registry_t;
+typedef struct serviceRegistry * service_registry_pt;
 
 #include "properties.h"
 #include "filter.h"
@@ -38,24 +38,24 @@ typedef struct serviceRegistry * service
 #include "array_list.h"
 #include "service_registration.h"
 
-service_registry_t serviceRegistry_create(framework_t framework, void (*serviceChanged)(framework_t, service_event_type_e, service_registration_t, properties_t));
-celix_status_t serviceRegistry_destroy(service_registry_t registry);
-celix_status_t serviceRegistry_getRegisteredServices(service_registry_t registry, apr_pool_t *pool, bundle_t bundle, array_list_t *services);
-array_list_t serviceRegistry_getServicesInUse(service_registry_t registry, bundle_t bundle);
-service_registration_t serviceRegistry_registerService(service_registry_t registry, bundle_t bundle, char * serviceName, void * serviceObject, properties_t dictionary);
-service_registration_t serviceRegistry_registerServiceFactory(service_registry_t registry, bundle_t bundle, char * serviceName, service_factory_t factory, properties_t dictionary);
-void serviceRegistry_unregisterService(service_registry_t registry, bundle_t bundle, service_registration_t registration);
-void serviceRegistry_unregisterServices(service_registry_t registry, bundle_t bundle);
-celix_status_t serviceRegistry_getServiceReferences(service_registry_t registry, apr_pool_t *pool, const char *serviceName, filter_t filter, array_list_t *references);
-void * serviceRegistry_getService(service_registry_t registry, bundle_t bundle, service_reference_t reference);
-bool serviceRegistry_ungetService(service_registry_t registry, bundle_t bundle, service_reference_t reference);
-void serviceRegistry_ungetServices(service_registry_t registry, bundle_t bundle);
-array_list_t serviceRegistry_getUsingBundles(service_registry_t registry, apr_pool_t *pool, service_reference_t reference);
-service_registration_t serviceRegistry_findRegistration(service_registry_t registry, service_reference_t reference);
-celix_status_t serviceRegistry_createServiceReference(service_registry_t registry, apr_pool_t *pool, service_registration_t registration, service_reference_t *reference);
+service_registry_pt serviceRegistry_create(framework_pt framework, void (*serviceChanged)(framework_pt, service_event_type_e, service_registration_pt, properties_pt));
+celix_status_t serviceRegistry_destroy(service_registry_pt registry);
+celix_status_t serviceRegistry_getRegisteredServices(service_registry_pt registry, apr_pool_t *pool, bundle_pt bundle, array_list_pt *services);
+array_list_pt serviceRegistry_getServicesInUse(service_registry_pt registry, bundle_pt bundle);
+service_registration_pt serviceRegistry_registerService(service_registry_pt registry, bundle_pt bundle, char * serviceName, void * serviceObject, properties_pt dictionary);
+service_registration_pt serviceRegistry_registerServiceFactory(service_registry_pt registry, bundle_pt bundle, char * serviceName, service_factory_pt factory, properties_pt dictionary);
+void serviceRegistry_unregisterService(service_registry_pt registry, bundle_pt bundle, service_registration_pt registration);
+void serviceRegistry_unregisterServices(service_registry_pt registry, bundle_pt bundle);
+celix_status_t serviceRegistry_getServiceReferences(service_registry_pt registry, apr_pool_t *pool, const char *serviceName, filter_pt filter, array_list_pt *references);
+void * serviceRegistry_getService(service_registry_pt registry, bundle_pt bundle, service_reference_pt reference);
+bool serviceRegistry_ungetService(service_registry_pt registry, bundle_pt bundle, service_reference_pt reference);
+void serviceRegistry_ungetServices(service_registry_pt registry, bundle_pt bundle);
+array_list_pt serviceRegistry_getUsingBundles(service_registry_pt registry, apr_pool_t *pool, service_reference_pt reference);
+service_registration_pt serviceRegistry_findRegistration(service_registry_pt registry, service_reference_pt reference);
+celix_status_t serviceRegistry_createServiceReference(service_registry_pt registry, apr_pool_t *pool, service_registration_pt registration, service_reference_pt *reference);
 
-celix_status_t serviceRegistry_getListenerHooks(service_registry_t registry, apr_pool_t *pool, array_list_t *hooks);
+celix_status_t serviceRegistry_getListenerHooks(service_registry_pt registry, apr_pool_t *pool, array_list_pt *hooks);
 
-celix_status_t serviceRegistry_servicePropertiesModified(service_registry_t registry, service_registration_t registration, properties_t oldprops);
+celix_status_t serviceRegistry_servicePropertiesModified(service_registry_pt registry, service_registration_pt registration, properties_pt oldprops);
 
 #endif /* SERVICE_REGISTRY_H_ */

Modified: incubator/celix/trunk/framework/public/include/service_tracker.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker.h (original)
+++ incubator/celix/trunk/framework/public/include/service_tracker.h Wed Jun 12 19:08:50 2013
@@ -33,21 +33,21 @@
 #include "service_tracker_customizer.h"
 #include "framework_exports.h"
 
-typedef struct serviceTracker * service_tracker_t;
+typedef struct serviceTracker * service_tracker_pt;
 
-FRAMEWORK_EXPORT celix_status_t serviceTracker_create(apr_pool_t *pool, bundle_context_t context, char * service, service_tracker_customizer_t customizer, service_tracker_t *tracker);
-FRAMEWORK_EXPORT celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, bundle_context_t context, char * filter, service_tracker_customizer_t customizer, service_tracker_t *tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_create(apr_pool_t *pool, bundle_context_pt context, char * service, service_tracker_customizer_pt customizer, service_tracker_pt *tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool, bundle_context_pt context, char * filter, service_tracker_customizer_pt customizer, service_tracker_pt *tracker);
 
-FRAMEWORK_EXPORT celix_status_t serviceTracker_open(service_tracker_t tracker);
-FRAMEWORK_EXPORT celix_status_t serviceTracker_close(service_tracker_t tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_open(service_tracker_pt tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_close(service_tracker_pt tracker);
 
-FRAMEWORK_EXPORT service_reference_t serviceTracker_getServiceReference(service_tracker_t tracker);
-FRAMEWORK_EXPORT array_list_t serviceTracker_getServiceReferences(service_tracker_t tracker);
+FRAMEWORK_EXPORT service_reference_pt serviceTracker_getServiceReference(service_tracker_pt tracker);
+FRAMEWORK_EXPORT array_list_pt serviceTracker_getServiceReferences(service_tracker_pt tracker);
 
-FRAMEWORK_EXPORT void * serviceTracker_getService(service_tracker_t tracker);
-FRAMEWORK_EXPORT array_list_t serviceTracker_getServices(service_tracker_t tracker);
-FRAMEWORK_EXPORT void * serviceTracker_getServiceByReference(service_tracker_t tracker, service_reference_t reference);
+FRAMEWORK_EXPORT void * serviceTracker_getService(service_tracker_pt tracker);
+FRAMEWORK_EXPORT array_list_pt serviceTracker_getServices(service_tracker_pt tracker);
+FRAMEWORK_EXPORT void * serviceTracker_getServiceByReference(service_tracker_pt tracker, service_reference_pt reference);
 
-FRAMEWORK_EXPORT void serviceTracker_serviceChanged(service_listener_t listener, service_event_t event);
+FRAMEWORK_EXPORT void serviceTracker_serviceChanged(service_listener_pt listener, service_event_pt event);
 
 #endif /* SERVICE_TRACKER_H_ */

Modified: incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker_customizer.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker_customizer.h (original)
+++ incubator/celix/trunk/framework/public/include/service_tracker_customizer.h Wed Jun 12 19:08:50 2013
@@ -33,22 +33,22 @@
 #include "celix_errno.h"
 #include "framework_exports.h"
 
-typedef celix_status_t (*addingCallback)(void *handle, service_reference_t reference, void **service);
-typedef celix_status_t (*addedCallback)(void * handle, service_reference_t reference, void * service);
-typedef celix_status_t (*modifiedCallback)(void * handle, service_reference_t reference, void * service);
-typedef celix_status_t (*removedCallback)(void * handle, service_reference_t reference, void * service);
+typedef celix_status_t (*adding_callback_pt)(void *handle, service_reference_pt reference, void **service);
+typedef celix_status_t (*added_callback_pt)(void * handle, service_reference_pt reference, void * service);
+typedef celix_status_t (*modified_callback_pt)(void * handle, service_reference_pt reference, void * service);
+typedef celix_status_t (*removed_callback_pt)(void * handle, service_reference_pt reference, void * service);
 
-typedef struct serviceTrackerCustomizer *service_tracker_customizer_t;
+typedef struct serviceTrackerCustomizer *service_tracker_customizer_pt;
 
 FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_create(apr_pool_t *pool, void *handle,
-		addingCallback addingFunction, addedCallback addedFunction,
-		modifiedCallback modifiedFunction, removedCallback removedFunction,
-		service_tracker_customizer_t *customizer);
+		adding_callback_pt addingFunction, added_callback_pt addedFunction,
+		modified_callback_pt modifiedFunction, removed_callback_pt removedFunction,
+		service_tracker_customizer_pt *customizer);
 
-FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getHandle(service_tracker_customizer_t customizer, void **handle);
-FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getAddingFunction(service_tracker_customizer_t customizer, addingCallback *function);
-FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getAddedFunction(service_tracker_customizer_t customizer, addedCallback *function);
-FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getModifiedFunction(service_tracker_customizer_t customizer, modifiedCallback *function);
-FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getRemovedFunction(service_tracker_customizer_t customizer, removedCallback *function);
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getHandle(service_tracker_customizer_pt customizer, void **handle);
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getAddingFunction(service_tracker_customizer_pt customizer, adding_callback_pt *function);
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getAddedFunction(service_tracker_customizer_pt customizer, added_callback_pt *function);
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getModifiedFunction(service_tracker_customizer_pt customizer, modified_callback_pt *function);
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_getRemovedFunction(service_tracker_customizer_pt customizer, removed_callback_pt *function);
 
 #endif /* service_tracker_customizer_t_H_ */

Modified: incubator/celix/trunk/framework/public/include/version.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/version.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/version.h (original)
+++ incubator/celix/trunk/framework/public/include/version.h Wed Jun 12 19:08:50 2013
@@ -38,12 +38,12 @@
  */
 
 /**
- * The definition of the version_t abstract data type.
+ * The definition of the version_pt abstract data type.
  */
-typedef struct version * version_t;
+typedef struct version * version_pt;
 
 /**
- * Creates a new version_t using the supplied arguments.
+ * Creates a new version_pt using the supplied arguments.
  *
  * @param pool The pool to create the version on.
  * @param major Major component of the version identifier.
@@ -52,14 +52,14 @@ typedef struct version * version_t;
  * @param qualifier Qualifier component of the version identifier. If
  *        <code>null</code> is specified, then the qualifier will be set to
  *        the empty string.
- * @param version The created version_t
+ * @param version The created version_pt
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>version</code> failed.
  * 		- CELIX_ILLEGAL_ARGUMENT If the numerical components are negative
  * 		  or the qualifier string is invalid.
  */
-celix_status_t version_createVersion(apr_pool_t *pool, int major, int minor, int micro, char * qualifier, version_t *version);
+celix_status_t version_createVersion(apr_pool_t *pool, int major, int minor, int micro, char * qualifier, version_pt *version);
 
 /**
  * Creates a clone of <code>version</code> allocated on <code>pool</code>.
@@ -73,7 +73,7 @@ celix_status_t version_createVersion(apr
  * 		- CELIX_ILLEGAL_ARGUMENT If the numerical components are negative
  * 		  or the qualifier string is invalid.
  */
-celix_status_t version_clone(version_t version, apr_pool_t *pool, version_t *clone);
+celix_status_t version_clone(version_pt version, apr_pool_t *pool, version_pt *clone);
 
 /**
  * Creates a version identifier from the specified string.
@@ -95,27 +95,27 @@ celix_status_t version_clone(version_t v
  *
  * @param pool The pool to create the version on.
  * @param versionStr String representation of the version identifier.
- * @param version The created version_t
+ * @param version The created version_pt
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>version</code> failed.
  * 		- CELIX_ILLEGAL_ARGUMENT If the numerical components are negative,
  * 		  	the qualifier string is invalid or <code>versionStr</code> is impropertly formatted.
  */
-celix_status_t version_createVersionFromString(apr_pool_t *pool, char * versionStr, version_t *version);
+celix_status_t version_createVersionFromString(apr_pool_t *pool, char * versionStr, version_pt *version);
 
 /**
  * The empty version "0.0.0".
  *
  * @param pool The pool to create the version on.
- * @param version The created version_t
+ * @param version The created version_pt
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>version</code> failed.
  * 		- CELIX_ILLEGAL_ARGUMENT If the numerical components are negative,
  * 		  	the qualifier string is invalid or <code>versionStr</code> is impropertly formatted.
  */
-celix_status_t version_createEmptyVersion(apr_pool_t *pool, version_t *version);
+celix_status_t version_createEmptyVersion(apr_pool_t *pool, version_pt *version);
 
 /**
  * Compares this <code>Version</code> object to another object.
@@ -135,14 +135,14 @@ celix_status_t version_createEmptyVersio
  * major, minor and micro components are equal and the qualifier component
  * is equal (using <code>String.compareTo</code>).
  *
- * @param version The <code>version_t</code> to be compared with <code>compare</code>.
- * @param compare The <code>version_t</code> to be compared with <code>version</code>.
+ * @param version The <code>version_pt</code> to be compared with <code>compare</code>.
+ * @param compare The <code>version_pt</code> to be compared with <code>version</code>.
  * @param result A negative integer, zero, or a positive integer if <code>version</code> is
  *         less than, equal to, or greater than the <code>compare</code>.
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t version_compareTo(version_t version, version_t compare, int *result);
+celix_status_t version_compareTo(version_pt version, version_pt compare, int *result);
 
 /**
  * Returns the string representation of <code>version</code> identifier.
@@ -153,13 +153,13 @@ celix_status_t version_compareTo(version
  * <code>major.minor.micro.qualifier</code> otherwise.
  *
  * @return The string representation of this version identifier.
- * @param version The <code>version_t</code> to get the string representation from.
+ * @param version The <code>version_pt</code> to get the string representation from.
  * @param pool The pool on which the string has to be allocated.
  * @param string Pointer to the string (char *) in which the result will be placed.
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t version_toString(version_t version, apr_pool_t *pool, char **string);
+celix_status_t version_toString(version_pt version, apr_pool_t *pool, char **string);
 
 /**
  * @}

Modified: incubator/celix/trunk/framework/public/include/version_range.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/version_range.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/version_range.h (original)
+++ incubator/celix/trunk/framework/public/include/version_range.h Wed Jun 12 19:08:50 2013
@@ -39,12 +39,12 @@
 #include "celix_errno.h"
 
 /**
- * Type definition for the version_range_t abstract data type.
+ * Type definition for the version_range_pt abstract data type.
  */
-typedef struct versionRange * version_range_t;
+typedef struct versionRange * version_range_pt;
 
 /**
- * Creates a new <code>version_range_t</code>.
+ * Creates a new <code>version_range_pt</code>.
  *
  * @param pool The pool in which the version range is created
  * @param low Lower bound version
@@ -56,7 +56,7 @@ typedef struct versionRange * version_ra
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>versionRange</code> failed.
  */
-celix_status_t versionRange_createVersionRange(apr_pool_t *pool, version_t low, bool isLowInclusive, version_t high, bool isHighInclusive, version_range_t *versionRange);
+celix_status_t versionRange_createVersionRange(apr_pool_t *pool, version_pt low, bool isLowInclusive, version_pt high, bool isHighInclusive, version_range_pt *versionRange);
 
 /**
  * Creates an infinite version range using ::version_createEmptyVersion for the low version,
@@ -68,7 +68,7 @@ celix_status_t versionRange_createVersio
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>range</code> failed.
  */
-celix_status_t versionRange_createInfiniteVersionRange(apr_pool_t *pool, version_range_t *range);
+celix_status_t versionRange_createInfiniteVersionRange(apr_pool_t *pool, version_range_pt *range);
 
 /**
  * Determine if the specified version is part of the version range or not.
@@ -79,7 +79,7 @@ celix_status_t versionRange_createInfini
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t versionRange_isInRange(version_range_t versionRange, version_t version, bool *inRange);
+celix_status_t versionRange_isInRange(version_range_pt versionRange, version_pt version, bool *inRange);
 
 /**
  * Parses a version range from the specified string.
@@ -97,14 +97,14 @@ celix_status_t versionRange_isInRange(ve
  *
  * @param pool The pool in which the range is created.
  * @param rangeStr String representation of the version range.
- * @param range The created version_range_t.
+ * @param range The created version_range_pt.
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>versionRange</code> failed.
  * 		- CELIX_ILLEGAL_ARGUMENT If the numerical components are negative,
  * 		  	the qualifier string is invalid or <code>versionStr</code> is impropertly formatted.
  */
-celix_status_t versionRange_parse(apr_pool_t *pool, char * rangeStr, version_range_t *range);
+celix_status_t versionRange_parse(apr_pool_t *pool, char * rangeStr, version_range_pt *range);
 
 /**
  * @}

Modified: incubator/celix/trunk/framework/public/include/wire.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/wire.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/wire.h (original)
+++ incubator/celix/trunk/framework/public/include/wire.h Wed Jun 12 19:08:50 2013
@@ -27,7 +27,7 @@
 #ifndef WIRE_H_
 #define WIRE_H_
 
-typedef struct wire *wire_t;
+typedef struct wire *wire_pt;
 
 #include "requirement.h"
 #include "capability.h"
@@ -54,8 +54,8 @@ typedef struct wire *wire_t;
  * 		- CELIX_SUCCESS when no errors are encountered.
  * 		- CELIX_ENOMEM If allocating memory for <code>wire</code> failed.
  */
-celix_status_t wire_create(apr_pool_t *pool, module_t importer, requirement_t requirement,
-		module_t exporter, capability_t capability, wire_t *wire);
+celix_status_t wire_create(apr_pool_t *pool, module_pt importer, requirement_pt requirement,
+		module_pt exporter, capability_pt capability, wire_pt *wire);
 
 /**
  * Getter for the capability of the exporting module.
@@ -65,7 +65,7 @@ celix_status_t wire_create(apr_pool_t *p
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t wire_getCapability(wire_t wire, capability_t *capability);
+celix_status_t wire_getCapability(wire_pt wire, capability_pt *capability);
 
 /**
  * Getter for the requirement of the importing module.
@@ -75,7 +75,7 @@ celix_status_t wire_getCapability(wire_t
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t wire_getRequirement(wire_t wire, requirement_t *requirement);
+celix_status_t wire_getRequirement(wire_pt wire, requirement_pt *requirement);
 
 /**
  * Getter for the importer of the wire.
@@ -85,7 +85,7 @@ celix_status_t wire_getRequirement(wire_
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t wire_getImporter(wire_t wire, module_t *importer);
+celix_status_t wire_getImporter(wire_pt wire, module_pt *importer);
 
 /**
  * Getter for the exporter of the wire.
@@ -95,7 +95,7 @@ celix_status_t wire_getImporter(wire_t w
  * @return Status code indication failure or success:
  * 		- CELIX_SUCCESS when no errors are encountered.
  */
-celix_status_t wire_getExporter(wire_t wire, module_t *exporter);
+celix_status_t wire_getExporter(wire_pt wire, module_pt *exporter);
 
 /**
  * @}

Modified: incubator/celix/trunk/hessian/source/private/src/hessian_in.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/private/src/hessian_in.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/private/src/hessian_in.c (original)
+++ incubator/celix/trunk/hessian/source/private/src/hessian_in.c Wed Jun 12 19:08:50 2013
@@ -31,16 +31,16 @@
 
 static int END_OF_DATA = -2;
 
-int hessian_parseChar(hessian_in_t in, char *c);
-int hessian_parseLong(hessian_in_t in, long *value);
-int hessian_parseInt16(hessian_in_t in, int *value);
-int hessian_parseInt(hessian_in_t in, int *value);
+int hessian_parseChar(hessian_in_pt in, char *c);
+int hessian_parseLong(hessian_in_pt in, long *value);
+int hessian_parseInt16(hessian_in_pt in, int *value);
+int hessian_parseInt(hessian_in_pt in, int *value);
 
-char hessian_read(hessian_in_t in) {
+char hessian_read(hessian_in_pt in) {
 	return (in->buffer[in->offset++] & 0xFF);
 }
 
-int hessian_readBoolean(hessian_in_t in, bool *value) {
+int hessian_readBoolean(hessian_in_pt in, bool *value) {
 	char tag = hessian_read(in);
 
 	switch (tag) {
@@ -56,7 +56,7 @@ int hessian_readBoolean(hessian_in_t in,
 	return 0;
 }
 
-int hessian_readInt(hessian_in_t in, int *value) {
+int hessian_readInt(hessian_in_pt in, int *value) {
 	unsigned char tag = hessian_read(in);
 
 	switch (tag) {
@@ -109,7 +109,7 @@ int hessian_readInt(hessian_in_t in, int
 	return 1;
 }
 
-int hessian_readLong(hessian_in_t in, long *value) {
+int hessian_readLong(hessian_in_pt in, long *value) {
 	unsigned char tag = hessian_read(in);
 
 	switch (tag) {
@@ -149,7 +149,7 @@ int hessian_readLong(hessian_in_t in, lo
 	return 0;
 }
 
-int hessian_readDouble(hessian_in_t in, double *value) {
+int hessian_readDouble(hessian_in_pt in, double *value) {
 	unsigned char tag = hessian_read(in);
 
 	long l;
@@ -185,7 +185,7 @@ int hessian_readDouble(hessian_in_t in, 
 	return 0;
 }
 
-int hessian_readUTCDate(hessian_in_t in, long *value) {
+int hessian_readUTCDate(hessian_in_pt in, long *value) {
 	unsigned char tag = hessian_read(in);
 
 	if (tag == 'd') {
@@ -195,7 +195,7 @@ int hessian_readUTCDate(hessian_in_t in,
 	return 0;
 }
 
-int hessian_readNull(hessian_in_t in) {
+int hessian_readNull(hessian_in_pt in) {
 	unsigned char tag = hessian_read(in);
 
 	switch (tag) {
@@ -208,7 +208,7 @@ int hessian_readNull(hessian_in_t in) {
 	return 0;
 }
 
-int hessian_readChar(hessian_in_t in, char *value) {
+int hessian_readChar(hessian_in_pt in, char *value) {
 	char *readC;
 	unsigned int read;
 	hessian_readNString(in, 0, 1, &readC, &read);
@@ -217,11 +217,11 @@ int hessian_readChar(hessian_in_t in, ch
 	return 0;
 }
 
-int hessian_readString(hessian_in_t in, char **value, unsigned int *readLength) {
+int hessian_readString(hessian_in_pt in, char **value, unsigned int *readLength) {
 	return hessian_readNString(in, 0, -1, value, readLength);
 }
 
-int hessian_readNString(hessian_in_t in, int offset, int length, char **value, unsigned int *readLength) {
+int hessian_readNString(hessian_in_pt in, int offset, int length, char **value, unsigned int *readLength) {
 	*readLength = 0;
 
 	bool done = false;
@@ -331,7 +331,7 @@ int hessian_readNString(hessian_in_t in,
 	return 0;
 }
 
-int hessian_readByte(hessian_in_t in, unsigned char *value) {
+int hessian_readByte(hessian_in_pt in, unsigned char *value) {
 	unsigned char *readC;
 	unsigned int read;
 	hessian_readNBytes(in, 0, 1, &readC, &read);
@@ -340,11 +340,11 @@ int hessian_readByte(hessian_in_t in, un
 	return 0;
 }
 
-int hessian_readBytes(hessian_in_t in, unsigned char **value, unsigned int *readLength) {
+int hessian_readBytes(hessian_in_pt in, unsigned char **value, unsigned int *readLength) {
 	return hessian_readNBytes(in, 0, -1, value, readLength);
 }
 
-int hessian_readNBytes(hessian_in_t in, int offset, int length, unsigned char **value, unsigned int *readLength) {
+int hessian_readNBytes(hessian_in_pt in, int offset, int length, unsigned char **value, unsigned int *readLength) {
 	*readLength = 0;
 
 	bool done = false;
@@ -432,7 +432,7 @@ int hessian_readNBytes(hessian_in_t in, 
 	return 0;
 }
 
-int hessian_parseChar(hessian_in_t in, char *c) {
+int hessian_parseChar(hessian_in_pt in, char *c) {
 	unsigned char ch = hessian_read(in);
 
 	if (ch < 0x80) {
@@ -453,7 +453,7 @@ int hessian_parseChar(hessian_in_t in, c
 	return 0;
 }
 
-int hessian_parseInt16(hessian_in_t in, int *value) {
+int hessian_parseInt16(hessian_in_pt in, int *value) {
 	int b16 = hessian_read(in) & 0xFF;
 	int b8 = hessian_read(in) & 0xFF;
 
@@ -463,7 +463,7 @@ int hessian_parseInt16(hessian_in_t in, 
 	return 0;
 }
 
-int hessian_parseInt(hessian_in_t in, int *value) {
+int hessian_parseInt(hessian_in_pt in, int *value) {
 	int b32 = hessian_read(in) & 0xFF;
 	int b24 = hessian_read(in) & 0xFF;
 	int b16 = hessian_read(in) & 0xFF;
@@ -477,7 +477,7 @@ int hessian_parseInt(hessian_in_t in, in
 	return 0;
 }
 
-int hessian_parseLong(hessian_in_t in, long *value) {
+int hessian_parseLong(hessian_in_pt in, long *value) {
 	long b64 = hessian_read(in) & 0xFF;
 	long b56 = hessian_read(in) & 0xFF;
 	long b48 = hessian_read(in) & 0xFF;

Modified: incubator/celix/trunk/hessian/source/private/src/hessian_out.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/private/src/hessian_out.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/private/src/hessian_out.c (original)
+++ incubator/celix/trunk/hessian/source/private/src/hessian_out.c Wed Jun 12 19:08:50 2013
@@ -29,17 +29,17 @@
 
 #include "hessian_2.0.h"
 
-void hessian_ensureCapacity(hessian_out_t obj, int capacity);
+void hessian_ensureCapacity(hessian_out_pt obj, int capacity);
 
-int hessian_printString(hessian_out_t out, char *value);
-int hessian_printNString(hessian_out_t out, char *value, int offset, int length);
+int hessian_printString(hessian_out_pt out, char *value);
+int hessian_printNString(hessian_out_pt out, char *value, int offset, int length);
 
-int hessian_writeType(hessian_out_t out, char *type);
+int hessian_writeType(hessian_out_pt out, char *type);
 
-int hessian_write(hessian_out_t out, unsigned char byte);
-int hessian_writeP(hessian_out_t out, unsigned char *byte);
+int hessian_write(hessian_out_pt out, unsigned char byte);
+int hessian_writeP(hessian_out_pt out, unsigned char *byte);
 
-int hessian_writeBoolean(hessian_out_t out, bool value) {
+int hessian_writeBoolean(hessian_out_pt out, bool value) {
 	hessian_ensureCapacity(out, out->offset + 1);
 
 	if (value) {
@@ -53,7 +53,7 @@ int hessian_writeBoolean(hessian_out_t o
 	return 0;
 }
 
-int hessian_writeInt(hessian_out_t out, int value) {
+int hessian_writeInt(hessian_out_pt out, int value) {
 	hessian_ensureCapacity(out, out->offset + 5);
 
 	if (INT_DIRECT_MIN <= value && value <= INT_DIRECT_MAX)
@@ -76,7 +76,7 @@ int hessian_writeInt(hessian_out_t out, 
 	return 0;
 }
 
-int hessian_writeLong(hessian_out_t out, long value) {
+int hessian_writeLong(hessian_out_pt out, long value) {
 	hessian_ensureCapacity(out, out->offset + 9);
 
 	if (LONG_DIRECT_MIN <= value && value <= LONG_DIRECT_MAX) {
@@ -109,7 +109,7 @@ int hessian_writeLong(hessian_out_t out,
 	return 0;
 }
 
-int hessian_writeDouble(hessian_out_t out, double value) {
+int hessian_writeDouble(hessian_out_pt out, double value) {
 	hessian_ensureCapacity(out, out->offset + 9);
 
 	int intValue = (int) value;
@@ -157,7 +157,7 @@ int hessian_writeDouble(hessian_out_t ou
 	return 0;
 }
 
-int hessian_writeUTCDate(hessian_out_t out, long value) {
+int hessian_writeUTCDate(hessian_out_pt out, long value) {
 	hessian_ensureCapacity(out, out->offset + 9);
 
 	hessian_write(out, (int) ('d'));
@@ -173,7 +173,7 @@ int hessian_writeUTCDate(hessian_out_t o
 	return 0;
 }
 
-int hessian_writeNull(hessian_out_t out) {
+int hessian_writeNull(hessian_out_pt out) {
 	hessian_ensureCapacity(out, out->offset + 1);
 
 	hessian_write(out, (int) ('N'));
@@ -181,12 +181,12 @@ int hessian_writeNull(hessian_out_t out)
 	return 0;
 }
 
-int hessian_writeString(hessian_out_t out, char *value) {
+int hessian_writeString(hessian_out_pt out, char *value) {
 	int length = strlen(value);
 	return hessian_writeNString(out, value, 0, length);
 }
 
-int hessian_writeNString(hessian_out_t out, char *value, int offset, int length) {
+int hessian_writeNString(hessian_out_pt out, char *value, int offset, int length) {
 	if (value == NULL) {
 		hessian_writeNull(out);
 	} else {
@@ -229,11 +229,11 @@ int hessian_writeNString(hessian_out_t o
 	return 0;
 }
 
-int hessian_writeBytes(hessian_out_t out, unsigned char value[], int length) {
+int hessian_writeBytes(hessian_out_pt out, unsigned char value[], int length) {
 	return hessian_writeNBytes(out, value, 0, length);
 }
 
-int hessian_writeNBytes(hessian_out_t out, unsigned char value[], int offset, int length) {
+int hessian_writeNBytes(hessian_out_pt out, unsigned char value[], int offset, int length) {
 	if (value == NULL) {
 		hessian_writeNull(out);
 	} else {
@@ -273,7 +273,7 @@ int hessian_writeNBytes(hessian_out_t ou
 	return 0;
 }
 
-int hessian_writeListBegin(hessian_out_t out, int length, char *type) {
+int hessian_writeListBegin(hessian_out_pt out, int length, char *type) {
 	hessian_ensureCapacity(out, out->offset + 1);
 	if (length < 0) {
 		if (type != NULL) {
@@ -309,14 +309,14 @@ int hessian_writeListBegin(hessian_out_t
 	return 0;
 }
 
-int hessian_writeListEnd(hessian_out_t out) {
+int hessian_writeListEnd(hessian_out_pt out) {
 	hessian_ensureCapacity(out, out->offset + 1);
 	hessian_write(out, (char) BC_END);
 
 	return 0;
 }
 
-int hessian_writeType(hessian_out_t out, char *type) {
+int hessian_writeType(hessian_out_pt out, char *type) {
 	int len = strlen(type);
 	if (len == 0) {
 		return 1;
@@ -326,7 +326,7 @@ int hessian_writeType(hessian_out_t out,
 	return hessian_writeString(out, type);
 }
 
-int hessian_startCall(hessian_out_t out, char *method, int length) {
+int hessian_startCall(hessian_out_pt out, char *method, int length) {
 	hessian_ensureCapacity(out, out->offset + 1);
 	hessian_write(out, 'C');
 
@@ -336,15 +336,15 @@ int hessian_startCall(hessian_out_t out,
 	return 0;
 }
 
-int hessian_completeCall(hessian_out_t out) {
+int hessian_completeCall(hessian_out_pt out) {
 	return 0;
 }
 
-int hessian_printString(hessian_out_t out, char *value) {
+int hessian_printString(hessian_out_pt out, char *value) {
 	return hessian_printNString(out, value, 0, strlen(value));
 }
 
-int hessian_printNString(hessian_out_t out, char *value, int offset, int length) {
+int hessian_printNString(hessian_out_pt out, char *value, int offset, int length) {
 	hessian_ensureCapacity(out, out->offset + length);
 
 	for (int i = 0; i < length; i++) {
@@ -371,7 +371,7 @@ int hessian_printNString(hessian_out_t o
 	return 0;
 }
 
-void hessian_ensureCapacity(hessian_out_t obj, int capacity) {
+void hessian_ensureCapacity(hessian_out_pt obj, int capacity) {
 	char *newArray;
 	int oldCapacity;
 	oldCapacity = obj->capacity;
@@ -386,14 +386,14 @@ void hessian_ensureCapacity(hessian_out_
 	}
 }
 
-int hessian_write(hessian_out_t out, unsigned char byte) {
+int hessian_write(hessian_out_pt out, unsigned char byte) {
 	out->buffer[out->offset++] = byte;
 	out->length++;
 
 	return 0;
 }
 
-int hessian_writeP(hessian_out_t out, unsigned char *byte) {
+int hessian_writeP(hessian_out_pt out, unsigned char *byte) {
 	out->buffer[out->offset++] = *byte;
 	out->length++;
 

Modified: incubator/celix/trunk/hessian/source/private/test/test_hessian_out.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/private/test/test_hessian_out.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/private/test/test_hessian_out.c (original)
+++ incubator/celix/trunk/hessian/source/private/test/test_hessian_out.c Wed Jun 12 19:08:50 2013
@@ -30,7 +30,7 @@
 
 #include "hessian_2.0_out.h"
 
-hessian_out_t out;
+hessian_out_pt out;
 
 int setup() {
 	out = malloc(sizeof(*out));

Modified: incubator/celix/trunk/hessian/source/private/test/test_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/private/test/test_service.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/private/test/test_service.h (original)
+++ incubator/celix/trunk/hessian/source/private/test/test_service.h Wed Jun 12 19:08:50 2013
@@ -27,9 +27,9 @@
 #ifndef TEST_SERVICE_H_
 #define TEST_SERVICE_H_
 
-typedef struct test_service *test_service_t;
+typedef struct test_service *test_service_pt;
 
-void testService_sayHello(test_service_t testService, char *message);
+void testService_sayHello(test_service_pt testService, char *message);
 
 
 #endif /* TEST_SERVICE_H_ */

Modified: incubator/celix/trunk/hessian/source/private/test/test_service_proxy.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/private/test/test_service_proxy.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/private/test/test_service_proxy.c (original)
+++ incubator/celix/trunk/hessian/source/private/test/test_service_proxy.c Wed Jun 12 19:08:50 2013
@@ -27,7 +27,7 @@
 #include "hessian_2.0_out.h"
 
 void testServiceProxy_sayHello(char *message) {
-	hessian_out_t out = malloc(sizeof(*out));
+	hessian_out_pt out = malloc(sizeof(*out));
 
 	hessian_writeString(out, message);
 

Modified: incubator/celix/trunk/hessian/source/private/test/test_service_skeleton.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/private/test/test_service_skeleton.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/private/test/test_service_skeleton.c (original)
+++ incubator/celix/trunk/hessian/source/private/test/test_service_skeleton.c Wed Jun 12 19:08:50 2013
@@ -27,9 +27,9 @@
 
 #include "hessian_2.0_in.h"
 
-void testServiceSkeleton_sayHello(hessian_in_t in);
+void testServiceSkeleton_sayHello(hessian_in_pt in);
 
-void testServiceSkeleton_handleData(hessian_in_t in) {
+void testServiceSkeleton_handleData(hessian_in_pt in) {
 	char *method = NULL;
 	hessian_readCall(in, &method);
 
@@ -42,7 +42,7 @@ void testServiceSkeleton_handleData(hess
 	}
 }
 
-void testServiceSkeleton_sayHello(hessian_in_t in) {
+void testServiceSkeleton_sayHello(hessian_in_pt in) {
 	char *message = NULL;
 	int read;
 	hessian_readString(in, &message, &read);

Modified: incubator/celix/trunk/hessian/source/public/include/hessian_2.0_in.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/public/include/hessian_2.0_in.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/public/include/hessian_2.0_in.h (original)
+++ incubator/celix/trunk/hessian/source/public/include/hessian_2.0_in.h Wed Jun 12 19:08:50 2013
@@ -31,20 +31,20 @@
 
 #include "hessian_2.0.h"
 
-typedef struct hessian * hessian_in_t;
+typedef struct hessian * hessian_in_pt;
 
-int hessian_readBoolean(hessian_in_t in, bool *value);
-int hessian_readInt(hessian_in_t in, int *value);
-int hessian_readLong(hessian_in_t in, long *value);
-int hessian_readDouble(hessian_in_t in, double *value);
-int hessian_readUTCDate(hessian_in_t in, long *value);
-int hessian_readNull(hessian_in_t in);
-int hessian_readChar(hessian_in_t in, char *value);
-int hessian_readString(hessian_in_t in, char **value, unsigned int *readLength);
-int hessian_readNString(hessian_in_t in, int offset, int length, char **value, unsigned int *readLength);
-int hessian_readByte(hessian_in_t in, unsigned char *value);
-int hessian_readBytes(hessian_in_t in, unsigned char **value, unsigned int *readLength);
-int hessian_readNBytes(hessian_in_t in, int offset, int length, unsigned char **value, unsigned int *readLength);
+int hessian_readBoolean(hessian_in_pt in, bool *value);
+int hessian_readInt(hessian_in_pt in, int *value);
+int hessian_readLong(hessian_in_pt in, long *value);
+int hessian_readDouble(hessian_in_pt in, double *value);
+int hessian_readUTCDate(hessian_in_pt in, long *value);
+int hessian_readNull(hessian_in_pt in);
+int hessian_readChar(hessian_in_pt in, char *value);
+int hessian_readString(hessian_in_pt in, char **value, unsigned int *readLength);
+int hessian_readNString(hessian_in_pt in, int offset, int length, char **value, unsigned int *readLength);
+int hessian_readByte(hessian_in_pt in, unsigned char *value);
+int hessian_readBytes(hessian_in_pt in, unsigned char **value, unsigned int *readLength);
+int hessian_readNBytes(hessian_in_pt in, int offset, int length, unsigned char **value, unsigned int *readLength);
 
 
 #endif /* HESSIAN_2_0_IN_H_ */

Modified: incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h (original)
+++ incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h Wed Jun 12 19:08:50 2013
@@ -33,28 +33,28 @@
 //#include "array_list.h"
 #include "hessian_2.0.h"
 
-typedef struct hessian * hessian_out_t;
+typedef struct hessian * hessian_out_pt;
 
-int hessian_writeBoolean(hessian_out_t out, bool value);
-int hessian_writeInt(hessian_out_t out, int value);
-int hessian_writeLong(hessian_out_t out, long value);
-int hessian_writeDouble(hessian_out_t out, double value);
-int hessian_writeUTCDate(hessian_out_t out, long value);
-int hessian_writeNull(hessian_out_t out);
-int hessian_writeString(hessian_out_t out, char *value);
-int hessian_writeNString(hessian_out_t out, char *value, int offset, int length);
-int hessian_writeBytes(hessian_out_t out, unsigned char value[], int length);
-int hessian_writeNBytes(hessian_out_t out, unsigned char value[], int offset, int length);
-
-int hessian_writeListBegin(hessian_out_t out, int size, char *type);
-int hessian_writeListEnd(hessian_out_t out);
-
-int hessian_writeObjectBegin(hessian_out_t out, char *type);
-int hessian_writeObjectDefinition(hessian_out_t out, char **fieldNames, int fields);
-int hessian_writeObjectEnd(hessian_out_t out);
+int hessian_writeBoolean(hessian_out_pt out, bool value);
+int hessian_writeInt(hessian_out_pt out, int value);
+int hessian_writeLong(hessian_out_pt out, long value);
+int hessian_writeDouble(hessian_out_pt out, double value);
+int hessian_writeUTCDate(hessian_out_pt out, long value);
+int hessian_writeNull(hessian_out_pt out);
+int hessian_writeString(hessian_out_pt out, char *value);
+int hessian_writeNString(hessian_out_pt out, char *value, int offset, int length);
+int hessian_writeBytes(hessian_out_pt out, unsigned char value[], int length);
+int hessian_writeNBytes(hessian_out_pt out, unsigned char value[], int offset, int length);
+
+int hessian_writeListBegin(hessian_out_pt out, int size, char *type);
+int hessian_writeListEnd(hessian_out_pt out);
+
+int hessian_writeObjectBegin(hessian_out_pt out, char *type);
+int hessian_writeObjectDefinition(hessian_out_pt out, char **fieldNames, int fields);
+int hessian_writeObjectEnd(hessian_out_pt out);
 
-int hessian_startCall(hessian_out_t out, char *method, int length);
-int hessian_completeCall(hessian_out_t out);
+int hessian_startCall(hessian_out_pt out, char *method, int length);
+int hessian_completeCall(hessian_out_pt out);
 
 
 

Modified: incubator/celix/trunk/hessian/source/test.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/test.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/test.c (original)
+++ incubator/celix/trunk/hessian/source/test.c Wed Jun 12 19:08:50 2013
@@ -30,7 +30,7 @@
 #include "hessian_2.0_in.h"
 
 int main(int argc, char **argv) {
-	hessian_out_t out = malloc(sizeof(*out));
+	hessian_out_pt out = malloc(sizeof(*out));
 
 //	hessian_writeDouble(out, 12.25);
 //	hessian_writeUTCDate(out, 894621091000l);

Modified: incubator/celix/trunk/launcher/private/src/launcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/private/src/launcher.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/private/src/launcher.c (original)
+++ incubator/celix/trunk/launcher/private/src/launcher.c Wed Jun 12 19:08:50 2013
@@ -48,7 +48,7 @@ int main(void) {
 	// Set signal handler
 	apr_status_t rv = APR_SUCCESS;
 	apr_status_t s = APR_SUCCESS;
-	properties_t config = NULL;
+	properties_pt config = NULL;
 	char *autoStart = NULL;
 
 	
@@ -78,11 +78,11 @@ int main(void) {
     if (apr_pool_create(&pool, memoryPool) == APR_SUCCESS) {
 		char delims[] = " ";
 		char *result = NULL;	
-        linked_list_t bundles;
-		array_list_t installed = NULL;
-		bundle_t bundle = NULL;
-		bundle_context_t context = NULL;
-		linked_list_iterator_t iter = NULL;
+        linked_list_pt bundles;
+		array_list_pt installed = NULL;
+		bundle_pt bundle = NULL;
+		bundle_context_pt context = NULL;
+		linked_list_iterator_pt iter = NULL;
 		unsigned int i;
 
         linkedList_create(pool, &bundles);
@@ -99,7 +99,7 @@ int main(void) {
         bundle_getContext(bundle, &context);
         iter = linkedListIterator_create(bundles, 0);
         while (linkedListIterator_hasNext(iter)) {
-            bundle_t current = NULL;
+            bundle_pt current = NULL;
             char * location = (char *) linkedListIterator_next(iter);
             if (bundleContext_installBundle(context, location, &current) == CELIX_SUCCESS) {
                 // Only add bundle if it is installed correctly
@@ -114,7 +114,7 @@ int main(void) {
         linkedListIterator_destroy(iter);
 
         for (i = 0; i < arrayList_size(installed); i++) {
-            bundle_t bundle = (bundle_t) arrayList_get(installed, i);
+            bundle_pt bundle = (bundle_pt) arrayList_get(installed, i);
             bundle_start(bundle, 0);
         }
 

Modified: incubator/celix/trunk/log_service/private/include/log.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/include/log.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/include/log.h (original)
+++ incubator/celix/trunk/log_service/private/include/log.h Wed Jun 12 19:08:50 2013
@@ -33,14 +33,14 @@
 #include "log_entry.h"
 #include "log_listener.h"
 
-typedef struct log * log_t;
+typedef struct log * log_pt;
 
-celix_status_t log_create(apr_pool_t *pool, log_t *logger);
-celix_status_t log_addEntry(log_t log, log_entry_t entry);
-celix_status_t log_getEntries(log_t log, apr_pool_t *memory_pool, linked_list_t *list);
+celix_status_t log_create(apr_pool_t *pool, log_pt *logger);
+celix_status_t log_addEntry(log_pt log, log_entry_pt entry);
+celix_status_t log_getEntries(log_pt log, apr_pool_t *memory_pool, linked_list_pt *list);
 
-celix_status_t log_addLogListener(log_t logger, log_listener_t listener);
-celix_status_t log_removeLogListener(log_t logger, log_listener_t listener);
-celix_status_t log_removeAllLogListener(log_t logger);
+celix_status_t log_addLogListener(log_pt logger, log_listener_pt listener);
+celix_status_t log_removeLogListener(log_pt logger, log_listener_pt listener);
+celix_status_t log_removeAllLogListener(log_pt logger);
 
 #endif /* LOG_H_ */

Modified: incubator/celix/trunk/log_service/private/include/log_factory.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/include/log_factory.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/include/log_factory.h (original)
+++ incubator/celix/trunk/log_service/private/include/log_factory.h Wed Jun 12 19:08:50 2013
@@ -29,11 +29,11 @@
 
 #include "log.h"
 
-typedef struct log_service_factory * log_service_factory_t;
+typedef struct log_service_factory * log_service_factory_pt;
 
-celix_status_t logFactory_create(apr_pool_t *pool, log_t log, service_factory_t *factory);
-celix_status_t logFactory_getService(void *factory, bundle_t bundle, service_registration_t registration, void **service);
-celix_status_t logFactory_ungetService(void *factory, bundle_t bundle, service_registration_t registration);
+celix_status_t logFactory_create(apr_pool_t *pool, log_pt log, service_factory_pt *factory);
+celix_status_t logFactory_getService(void *factory, bundle_pt bundle, service_registration_pt registration, void **service);
+celix_status_t logFactory_ungetService(void *factory, bundle_pt bundle, service_registration_pt registration);
 
 
 #endif /* LOG_FACTORY_H_ */

Modified: incubator/celix/trunk/log_service/private/include/log_reader_service_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/include/log_reader_service_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/include/log_reader_service_impl.h (original)
+++ incubator/celix/trunk/log_service/private/include/log_reader_service_impl.h Wed Jun 12 19:08:50 2013
@@ -30,13 +30,13 @@
 #include "log_reader_service.h"
 #include "log.h"
 
-celix_status_t logReaderService_create(log_t log, apr_pool_t *pool, log_reader_data_t *reader);
+celix_status_t logReaderService_create(log_pt log, apr_pool_t *pool, log_reader_data_pt *reader);
 
-celix_status_t logReaderService_getLog(log_reader_data_t reader, apr_pool_t *memory_pool, linked_list_t *list);
+celix_status_t logReaderService_getLog(log_reader_data_pt reader, apr_pool_t *memory_pool, linked_list_pt *list);
 
-celix_status_t logReaderService_addLogListener(log_reader_data_t reader, log_listener_t listener);
-celix_status_t logReaderService_removeLogListener(log_reader_data_t reader, log_listener_t listener);
-celix_status_t logReaderService_removeAllLogListener(log_reader_data_t reader);
+celix_status_t logReaderService_addLogListener(log_reader_data_pt reader, log_listener_pt listener);
+celix_status_t logReaderService_removeLogListener(log_reader_data_pt reader, log_listener_pt listener);
+celix_status_t logReaderService_removeAllLogListener(log_reader_data_pt reader);
 
 
 #endif /* LOG_READER_SERVICE_IMPL_H_ */

Modified: incubator/celix/trunk/log_service/private/include/log_service_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/include/log_service_impl.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/include/log_service_impl.h (original)
+++ incubator/celix/trunk/log_service/private/include/log_service_impl.h Wed Jun 12 19:08:50 2013
@@ -30,9 +30,9 @@
 #include "log_service.h"
 #include "log.h"
 
-celix_status_t logService_create(log_t log, bundle_t bundle, apr_pool_t *pool, log_service_data_t *logger);
-celix_status_t logService_log(log_service_data_t logger, log_level_t level, char * message);
-celix_status_t logService_logSr(log_service_data_t logger, service_reference_t reference, log_level_t level, char * message);
+celix_status_t logService_create(log_pt log, bundle_pt bundle, apr_pool_t *pool, log_service_data_pt *logger);
+celix_status_t logService_log(log_service_data_pt logger, log_level_t level, char * message);
+celix_status_t logService_logSr(log_service_data_pt logger, service_reference_pt reference, log_level_t level, char * message);
 
 
 #endif /* LOG_SERVICE_IMPL_H_ */

Modified: incubator/celix/trunk/log_service/private/src/log.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log.c (original)
+++ incubator/celix/trunk/log_service/private/src/log.c Wed Jun 12 19:08:50 2013
@@ -33,11 +33,11 @@
 #include "array_list.h"
 
 struct log {
-    linked_list_t entries;
+    linked_list_pt entries;
     apr_thread_mutex_t *lock;
 
-    array_list_t listeners;
-    array_list_t listenerEntries;
+    array_list_pt listeners;
+    array_list_pt listenerEntries;
 
     apr_thread_t *listenerThread;
     bool running;
@@ -49,13 +49,13 @@ struct log {
     apr_pool_t *pool;
 };
 
-celix_status_t log_startListenerThread(log_t logger);
-celix_status_t log_stopListenerThread(log_t logger);
+celix_status_t log_startListenerThread(log_pt logger);
+celix_status_t log_stopListenerThread(log_pt logger);
 
 void * APR_THREAD_FUNC log_listenerThread(apr_thread_t *thread, void *data);
 apr_status_t log_destroy(void *logp);
 
-celix_status_t log_create(apr_pool_t *pool, log_t *logger) {
+celix_status_t log_create(apr_pool_t *pool, log_pt *logger) {
     celix_status_t status = CELIX_SUCCESS;
 
     *logger = apr_palloc(pool, sizeof(**logger));
@@ -97,7 +97,7 @@ celix_status_t log_create(apr_pool_t *po
 }
 
 apr_status_t log_destroy(void *logp) {
-	log_t log = logp;
+	log_pt log = logp;
 	apr_thread_mutex_destroy(log->listenerLock);
 	apr_thread_mutex_destroy(log->deliverLock);
 	apr_thread_cond_destroy(log->entriesToDeliver);
@@ -108,7 +108,7 @@ apr_status_t log_destroy(void *logp) {
 	return APR_SUCCESS;
 }
 
-celix_status_t log_addEntry(log_t log, log_entry_t entry) {
+celix_status_t log_addEntry(log_pt log, log_entry_pt entry) {
     apr_thread_mutex_lock(log->lock);
     linkedList_addElement(log->entries, entry);
 
@@ -123,10 +123,10 @@ celix_status_t log_addEntry(log_t log, l
     return CELIX_SUCCESS;
 }
 
-celix_status_t log_getEntries(log_t log, apr_pool_t *memory_pool, linked_list_t *list) {
-    linked_list_t entries = NULL;
+celix_status_t log_getEntries(log_pt log, apr_pool_t *memory_pool, linked_list_pt *list) {
+    linked_list_pt entries = NULL;
     if (linkedList_create(memory_pool, &entries) == CELIX_SUCCESS) {
-        linked_list_iterator_t iter = NULL;
+        linked_list_iterator_pt iter = NULL;
 
         apr_thread_mutex_lock(log->lock);
 
@@ -145,7 +145,7 @@ celix_status_t log_getEntries(log_t log,
     }
 }
 
-celix_status_t log_addLogListener(log_t logger, log_listener_t listener) {
+celix_status_t log_addLogListener(log_pt logger, log_listener_pt listener) {
     celix_status_t status = CELIX_SUCCESS;
     apr_status_t apr_status;
 
@@ -168,7 +168,7 @@ celix_status_t log_addLogListener(log_t 
     return status;
 }
 
-celix_status_t log_removeLogListener(log_t logger, log_listener_t listener) {
+celix_status_t log_removeLogListener(log_pt logger, log_listener_pt listener) {
     celix_status_t status = CELIX_SUCCESS;
     apr_status_t apr_status;
 
@@ -190,7 +190,7 @@ celix_status_t log_removeLogListener(log
     return status;
 }
 
-celix_status_t log_removeAllLogListener(log_t logger) {
+celix_status_t log_removeAllLogListener(log_pt logger) {
     celix_status_t status = CELIX_SUCCESS;
 
     apr_status_t apr_status;
@@ -211,7 +211,7 @@ celix_status_t log_removeAllLogListener(
     return status;
 }
 
-celix_status_t log_startListenerThread(log_t logger) {
+celix_status_t log_startListenerThread(log_pt logger) {
     celix_status_t status = CELIX_SUCCESS;
     apr_status_t apr_status;
 
@@ -224,7 +224,7 @@ celix_status_t log_startListenerThread(l
     return status;
 }
 
-celix_status_t log_stopListenerThread(log_t logger) {
+celix_status_t log_stopListenerThread(log_pt logger) {
     celix_status_t status = CELIX_SUCCESS;
     apr_status_t apr_status = APR_SUCCESS;
 
@@ -250,7 +250,7 @@ celix_status_t log_stopListenerThread(lo
 void * APR_THREAD_FUNC log_listenerThread(apr_thread_t *thread, void *data) {
     apr_status_t status = APR_SUCCESS;
 
-    log_t logger = data;
+    log_pt logger = data;
 
     while (logger->running) {
         status = apr_thread_mutex_lock(logger->deliverLock);
@@ -258,16 +258,16 @@ void * APR_THREAD_FUNC log_listenerThrea
             logger->running = false;
         } else {
             if (!arrayList_isEmpty(logger->listenerEntries)) {
-                log_entry_t entry = (log_entry_t) arrayList_remove(logger->listenerEntries, 0);
+                log_entry_pt entry = (log_entry_pt) arrayList_remove(logger->listenerEntries, 0);
 
                 status = apr_thread_mutex_lock(logger->listenerLock);
                 if (status != APR_SUCCESS) {
                     logger->running = false;
                     break;
                 } else {
-                    array_list_iterator_t it = arrayListIterator_create(logger->listeners);
+                    array_list_iterator_pt it = arrayListIterator_create(logger->listeners);
                     while (arrayListIterator_hasNext(it)) {
-                        log_listener_t listener = arrayListIterator_next(it);
+                        log_listener_pt listener = arrayListIterator_next(it);
                         listener->logged(listener, entry);
                     }
 

Modified: incubator/celix/trunk/log_service/private/src/log_entry.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_entry.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_entry.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_entry.c Wed Jun 12 19:08:50 2013
@@ -28,9 +28,9 @@
 
 #include "log_entry.h"
 
-celix_status_t logEntry_create(bundle_t bundle, service_reference_t reference,
+celix_status_t logEntry_create(bundle_pt bundle, service_reference_pt reference,
         log_level_t level, char *message, int errorCode,
-        apr_pool_t *pool, log_entry_t *entry) {
+        apr_pool_t *pool, log_entry_pt *entry) {
     celix_status_t status = CELIX_SUCCESS;
 
     *entry = apr_palloc(pool, sizeof(**entry));
@@ -48,32 +48,32 @@ celix_status_t logEntry_create(bundle_t 
     return status;
 }
 
-celix_status_t logEntry_getBundle(log_entry_t entry, bundle_t *bundle) {
+celix_status_t logEntry_getBundle(log_entry_pt entry, bundle_pt *bundle) {
     *bundle = entry->bundle;
     return CELIX_SUCCESS;
 }
 
-celix_status_t logEntry_getErrorCode(log_entry_t entry, int *errorCode) {
+celix_status_t logEntry_getErrorCode(log_entry_pt entry, int *errorCode) {
     *errorCode = entry->errorCode;
     return CELIX_SUCCESS;
 }
 
-celix_status_t logEntry_getLevel(log_entry_t entry, log_level_t *level) {
+celix_status_t logEntry_getLevel(log_entry_pt entry, log_level_t *level) {
     *level = entry->level;
     return CELIX_SUCCESS;
 }
 
-celix_status_t logEntry_getMessage(log_entry_t entry, char **message) {
+celix_status_t logEntry_getMessage(log_entry_pt entry, char **message) {
     *message = entry->message;
     return CELIX_SUCCESS;
 }
 
-celix_status_t logEntry_getServiceReference(log_entry_t entry, service_reference_t *reference) {
+celix_status_t logEntry_getServiceReference(log_entry_pt entry, service_reference_pt *reference) {
     *reference = entry->reference;
     return CELIX_SUCCESS;
 }
 
-celix_status_t logEntry_getTime(log_entry_t entry, time_t *time) {
+celix_status_t logEntry_getTime(log_entry_pt entry, time_t *time) {
     *time = entry->time;
     return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/log_service/private/src/log_factory.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_factory.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_factory.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_factory.c Wed Jun 12 19:08:50 2013
@@ -32,17 +32,17 @@
 
 struct log_service_factory {
     apr_pool_t *pool;
-    log_t log;
+    log_pt log;
 };
 
-celix_status_t logFactory_create(apr_pool_t *pool, log_t log, service_factory_t *factory) {
+celix_status_t logFactory_create(apr_pool_t *pool, log_pt log, service_factory_pt *factory) {
     celix_status_t status = CELIX_SUCCESS;
 
     *factory = apr_palloc(pool, sizeof(**factory));
     if (*factory == NULL) {
         status = CELIX_ENOMEM;
     } else {
-        log_service_factory_t factoryData = apr_palloc(pool, sizeof(*factoryData));
+        log_service_factory_pt factoryData = apr_palloc(pool, sizeof(*factoryData));
         if (factoryData == NULL) {
             status = CELIX_ENOMEM;
         } else {
@@ -58,10 +58,10 @@ celix_status_t logFactory_create(apr_poo
     return CELIX_SUCCESS;
 }
 
-celix_status_t logFactory_getService(void *factory, bundle_t bundle, service_registration_t registration, void **service) {
-    log_service_factory_t log_factory = ((service_factory_t) factory)->factory;
-    log_service_t log_service = NULL;
-    log_service_data_t log_service_data = NULL;
+celix_status_t logFactory_getService(void *factory, bundle_pt bundle, service_registration_pt registration, void **service) {
+    log_service_factory_pt log_factory = ((service_factory_pt) factory)->factory;
+    log_service_pt log_service = NULL;
+    log_service_data_pt log_service_data = NULL;
 
     logService_create(log_factory->log, bundle, log_factory->pool, &log_service_data);
 
@@ -75,7 +75,7 @@ celix_status_t logFactory_getService(voi
     return CELIX_SUCCESS;
 }
 
-celix_status_t logFactory_ungetService(void *factory, bundle_t bundle, service_registration_t registration) {
-    log_service_factory_t log_factory = ((service_factory_t) factory)->factory;
+celix_status_t logFactory_ungetService(void *factory, bundle_pt bundle, service_registration_pt registration) {
+    log_service_factory_pt log_factory = ((service_factory_pt) factory)->factory;
     return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/log_service/private/src/log_reader_service_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_reader_service_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_reader_service_impl.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_reader_service_impl.c Wed Jun 12 19:08:50 2013
@@ -30,14 +30,14 @@
 #include "celixbool.h"
 
 struct log_reader_data {
-    log_t log;
+    log_pt log;
     apr_pool_t *pool;
 };
 
-celix_status_t logReaderService_create(log_t log, apr_pool_t *pool, log_reader_data_t *reader) {
+celix_status_t logReaderService_create(log_pt log, apr_pool_t *pool, log_reader_data_pt *reader) {
     celix_status_t status = APR_SUCCESS;
 
-    *reader = (log_reader_data_t) apr_palloc(pool, sizeof(**reader));
+    *reader = (log_reader_data_pt) apr_palloc(pool, sizeof(**reader));
 
     if (reader == NULL) {
         status = CELIX_ENOMEM;
@@ -49,7 +49,7 @@ celix_status_t logReaderService_create(l
     return status;
 }
 
-celix_status_t logReaderService_getLog(log_reader_data_t reader, apr_pool_t *memory_pool, linked_list_t *list) {
+celix_status_t logReaderService_getLog(log_reader_data_pt reader, apr_pool_t *memory_pool, linked_list_pt *list) {
     celix_status_t status = CELIX_SUCCESS;
 
     status = log_getEntries(reader->log, memory_pool, list);
@@ -57,15 +57,15 @@ celix_status_t logReaderService_getLog(l
     return status;
 }
 
-celix_status_t logReaderService_addLogListener(log_reader_data_t reader, log_listener_t listener) {
+celix_status_t logReaderService_addLogListener(log_reader_data_pt reader, log_listener_pt listener) {
     return log_addLogListener(reader->log, listener);
 }
 
-celix_status_t logReaderService_removeLogListener(log_reader_data_t reader, log_listener_t listener) {
+celix_status_t logReaderService_removeLogListener(log_reader_data_pt reader, log_listener_pt listener) {
     return log_removeLogListener(reader->log, listener);
 }
 
-celix_status_t logReaderService_removeAllLogListener(log_reader_data_t reader) {
+celix_status_t logReaderService_removeAllLogListener(log_reader_data_pt reader) {
     return log_removeAllLogListener(reader->log);
 }
 

Modified: incubator/celix/trunk/log_service/private/src/log_service_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_service_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_service_activator.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_service_activator.c Wed Jun 12 19:08:50 2013
@@ -35,13 +35,13 @@
 #include "service_registration.h"
 
 struct logActivator {
-    bundle_context_t bundleContext;
-    service_registration_t logServiceFactoryReg;
-    service_registration_t logReaderServiceReg;
+    bundle_context_pt bundleContext;
+    service_registration_pt logServiceFactoryReg;
+    service_registration_pt logReaderServiceReg;
 
 };
 
-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 *mp = NULL;
 	struct logActivator * activator = NULL;
@@ -62,15 +62,15 @@ 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) {
     struct logActivator * activator = (struct logActivator *) userData;
     celix_status_t status = CELIX_SUCCESS;
     apr_pool_t *mp = NULL;
-    service_factory_t factory = NULL;
-    log_t logger = NULL;
+    service_factory_pt factory = NULL;
+    log_pt logger = NULL;
 
-    log_reader_data_t reader = NULL;
-    log_reader_service_t reader_service = NULL;
+    log_reader_data_pt reader = NULL;
+    log_reader_service_pt reader_service = NULL;
 
     bundleContext_getMemoryPool(context, &mp);
 
@@ -93,7 +93,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) {
 	struct logActivator * activator = (struct logActivator *) userData;
 
 	serviceRegistration_unregister(activator->logReaderServiceReg);
@@ -104,6 +104,6 @@ celix_status_t bundleActivator_stop(void
     return CELIX_SUCCESS;
 }
 
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
     return CELIX_SUCCESS;
 }

Modified: incubator/celix/trunk/log_service/private/src/log_service_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_service_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_service_impl.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_service_impl.c Wed Jun 12 19:08:50 2013
@@ -30,12 +30,12 @@
 #include "bundle.h"
 
 struct log_service_data {
-    log_t log;
-    bundle_t bundle;
+    log_pt log;
+    bundle_pt bundle;
     apr_pool_t *pool;
 };
 
-celix_status_t logService_create(log_t log, bundle_t bundle, apr_pool_t *pool, log_service_data_t *logger) {
+celix_status_t logService_create(log_pt log, bundle_pt bundle, apr_pool_t *pool, log_service_data_pt *logger) {
     celix_status_t status = CELIX_SUCCESS;
     *logger = apr_palloc(pool, sizeof(struct log_service_data));
     if (*logger == NULL) {
@@ -49,13 +49,13 @@ celix_status_t logService_create(log_t l
     return status;
 }
 
-celix_status_t logService_log(log_service_data_t logger, log_level_t level, char * message) {
+celix_status_t logService_log(log_service_data_pt logger, log_level_t level, char * message) {
     return logService_logSr(logger, NULL, level, message);
 }
 
-celix_status_t logService_logSr(log_service_data_t logger, service_reference_t reference, log_level_t level, char * message) {
-    log_entry_t entry = NULL;
-    bundle_t bundle = logger->bundle;
+celix_status_t logService_logSr(log_service_data_pt logger, service_reference_pt reference, log_level_t level, char * message) {
+    log_entry_pt entry = NULL;
+    bundle_pt bundle = logger->bundle;
     if (reference != NULL) {
     	serviceReference_getBundle(reference, &bundle);
     }

Modified: incubator/celix/trunk/log_service/public/include/log_entry.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_entry.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_entry.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_entry.h Wed Jun 12 19:08:50 2013
@@ -30,24 +30,24 @@
 #include "log_service.h"
 
 struct log_entry {
-    bundle_t bundle;
+    bundle_pt bundle;
     int errorCode;
     log_level_t level;
     char *message;
-    service_reference_t reference;
+    service_reference_pt reference;
     time_t time;
 };
 
-typedef struct log_entry * log_entry_t;
+typedef struct log_entry * log_entry_pt;
 
-celix_status_t logEntry_create(bundle_t bundle, service_reference_t reference,
+celix_status_t logEntry_create(bundle_pt bundle, service_reference_pt reference,
         log_level_t level, char *message, int errorCode,
-        apr_pool_t *pool, log_entry_t *entry);
-celix_status_t logEntry_getBundle(log_entry_t entry, bundle_t *bundle);
-celix_status_t logEntry_getErrorCode(log_entry_t entry, int *errorCode);
-celix_status_t logEntry_getLevel(log_entry_t entry, log_level_t *level);
-celix_status_t logEntry_getMessage(log_entry_t entry, char **message);
-celix_status_t logEntry_getServiceReference(log_entry_t entry, service_reference_t *reference);
-celix_status_t logEntry_getTime(log_entry_t entry, time_t *time);
+        apr_pool_t *pool, log_entry_pt *entry);
+celix_status_t logEntry_getBundle(log_entry_pt entry, bundle_pt *bundle);
+celix_status_t logEntry_getErrorCode(log_entry_pt entry, int *errorCode);
+celix_status_t logEntry_getLevel(log_entry_pt entry, log_level_t *level);
+celix_status_t logEntry_getMessage(log_entry_pt entry, char **message);
+celix_status_t logEntry_getServiceReference(log_entry_pt entry, service_reference_pt *reference);
+celix_status_t logEntry_getTime(log_entry_pt entry, time_t *time);
 
 #endif /* LOG_ENTRY_H_ */

Modified: incubator/celix/trunk/log_service/public/include/log_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_listener.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_listener.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_listener.h Wed Jun 12 19:08:50 2013
@@ -32,11 +32,11 @@
 
 struct log_listener {
     void *handle;
-    celix_status_t (*logged)(struct log_listener *listener, log_entry_t entry);
+    celix_status_t (*logged)(struct log_listener *listener, log_entry_pt entry);
 };
 
-typedef struct log_listener * log_listener_t;
+typedef struct log_listener * log_listener_pt;
 
-celix_status_t logListener_logged(log_listener_t listener, log_entry_t entry);
+celix_status_t logListener_logged(log_listener_pt listener, log_entry_pt entry);
 
 #endif /* LOG_LISTENER_H_ */

Modified: incubator/celix/trunk/log_service/public/include/log_reader_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_reader_service.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_reader_service.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_reader_service.h Wed Jun 12 19:08:50 2013
@@ -34,16 +34,16 @@
 
 static const char * const LOG_READER_SERVICE_NAME = "log_reader_service";
 
-typedef struct log_reader_data * log_reader_data_t;
+typedef struct log_reader_data * log_reader_data_pt;
 
 struct log_reader_service {
-    log_reader_data_t reader;
-    celix_status_t (*getLog)(log_reader_data_t reader, apr_pool_t *memory_pool, linked_list_t *list);
-    celix_status_t (*addLogListener)(log_reader_data_t reader, log_listener_t listener);
-    celix_status_t (*removeLogListener)(log_reader_data_t reader, log_listener_t listener);
-    celix_status_t (*removeAllLogListener)(log_reader_data_t reader);
+    log_reader_data_pt reader;
+    celix_status_t (*getLog)(log_reader_data_pt reader, apr_pool_t *memory_pool, linked_list_pt *list);
+    celix_status_t (*addLogListener)(log_reader_data_pt reader, log_listener_pt listener);
+    celix_status_t (*removeLogListener)(log_reader_data_pt reader, log_listener_pt listener);
+    celix_status_t (*removeAllLogListener)(log_reader_data_pt reader);
 };
 
-typedef struct log_reader_service * log_reader_service_t;
+typedef struct log_reader_service * log_reader_service_pt;
 
 #endif /* LOG_READER_SERVICE_H_ */

Modified: incubator/celix/trunk/log_service/public/include/log_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_service.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_service.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_service.h Wed Jun 12 19:08:50 2013
@@ -32,7 +32,7 @@
 
 static const char * const LOG_SERVICE_NAME = "log_service";
 
-typedef struct log_service_data *log_service_data_t;
+typedef struct log_service_data *log_service_data_pt;
 
 enum log_level
 {
@@ -45,12 +45,12 @@ enum log_level
 typedef enum log_level log_level_t;
 
 struct log_service {
-    log_service_data_t logger;
-    celix_status_t (*log)(log_service_data_t logger, log_level_t level, char * message);
-    celix_status_t (*logSr)(log_service_data_t logger, service_reference_t reference, log_level_t level, char * message);
+    log_service_data_pt logger;
+    celix_status_t (*log)(log_service_data_pt logger, log_level_t level, char * message);
+    celix_status_t (*logSr)(log_service_data_pt logger, service_reference_pt reference, log_level_t level, char * message);
 };
 
-typedef struct log_service *log_service_t;
+typedef struct log_service *log_service_pt;
 
 
 

Modified: incubator/celix/trunk/log_writer/private/include/log_writer.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/include/log_writer.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/include/log_writer.h (original)
+++ incubator/celix/trunk/log_writer/private/include/log_writer.h Wed Jun 12 19:08:50 2013
@@ -32,15 +32,15 @@
 #include "log_reader_service.h"
 
 struct log_writer {
-    log_reader_service_t logReader;
-    SERVICE service;
-    SERVICE_DEPENDENCY dep;
-    log_listener_t logListener;
+    log_reader_service_pt logReader;
+    service_pt service;
+    service_dependency_pt dep;
+    log_listener_pt logListener;
 };
 
-typedef struct log_writer *log_writer_t;
+typedef struct log_writer *log_writer_pt;
 
-celix_status_t logWriter_create(apr_pool_t *pool, log_writer_t *writer);
+celix_status_t logWriter_create(apr_pool_t *pool, log_writer_pt *writer);
 
 
 #endif /* LOG_WRITER_H_ */

Modified: incubator/celix/trunk/log_writer/private/src/dependency_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/src/dependency_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/src/dependency_activator.c (original)
+++ incubator/celix/trunk/log_writer/private/src/dependency_activator.c Wed Jun 12 19:08:50 2013
@@ -33,9 +33,9 @@
 #include "log_service.h"
 #include "bundle_context.h"
 
-void * dm_create(bundle_context_t context) {
+void * dm_create(bundle_context_pt context) {
     apr_pool_t *pool;
-	log_writer_t writer = NULL;
+	log_writer_pt writer = NULL;
 
     bundleContext_getMemoryPool(context, &pool);
 
@@ -43,10 +43,10 @@ void * dm_create(bundle_context_t contex
 	return writer;
 }
 
-void dm_init(void * userData, bundle_context_t context, DEPENDENCY_MANAGER manager) {
-	log_writer_t data = (log_writer_t) userData;
+void dm_init(void * userData, bundle_context_pt context, dependency_manager_pt manager) {
+	log_writer_pt data = (log_writer_pt) userData;
 
-	SERVICE service = dependencyActivatorBase_createService(manager);
+	service_pt service = dependencyActivatorBase_createService(manager);
 	serviceComponent_setImplementation(service, data);
 
 	data->dep = dependencyActivatorBase_createServiceDependency(manager);
@@ -59,8 +59,8 @@ void dm_init(void * userData, bundle_con
 	dependencyManager_add(manager, service);
 }
 
-void dm_destroy(void * userData, bundle_context_t context, DEPENDENCY_MANAGER manager) {
-    log_writer_t data = (log_writer_t) userData;
+void dm_destroy(void * userData, bundle_context_pt context, dependency_manager_pt manager) {
+    log_writer_pt data = (log_writer_pt) userData;
 //    serviceComponent_removeServiceDependency(data->service, data->dep);
 	dependencyManager_remove(manager, data->service);
 	//free(data);

Modified: incubator/celix/trunk/log_writer/private/src/log_writer.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/src/log_writer.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/src/log_writer.c (original)
+++ incubator/celix/trunk/log_writer/private/src/log_writer.c Wed Jun 12 19:08:50 2013
@@ -35,7 +35,7 @@
 #include "module.h"
 #include "bundle.h"
 
-celix_status_t logWriter_create(apr_pool_t *pool, log_writer_t *writer) {
+celix_status_t logWriter_create(apr_pool_t *pool, log_writer_pt *writer) {
     celix_status_t status = CELIX_SUCCESS;
 
     apr_pool_t *mypool;
@@ -55,14 +55,14 @@ void service_init(void * userData) {
 }
 
 void service_start(void * userData) {
-    log_writer_t writer = (log_writer_t) userData;
+    log_writer_pt writer = (log_writer_pt) userData;
     if (writer->logReader != NULL) {
     	writer->logReader->addLogListener(writer->logReader->reader, writer->logListener);
     }
 }
 
 void service_stop(void * userData) {
-    log_writer_t writer = (log_writer_t) userData;
+    log_writer_pt writer = (log_writer_pt) userData;
 
     if (writer->logReader != NULL) {
     	writer->logReader->removeLogListener(writer->logReader->reader, writer->logListener);
@@ -72,9 +72,9 @@ void service_stop(void * userData) {
 void service_destroy(void * userData) {
 }
 
-celix_status_t logListener_logged(log_listener_t listener, log_entry_t entry) {
+celix_status_t logListener_logged(log_listener_pt listener, log_entry_pt entry) {
 	celix_status_t status = CELIX_SUCCESS;
-    module_t module = NULL;
+    module_pt module = NULL;
     char *sName = NULL;
 
     status = bundle_getCurrentModule(entry->bundle, &module);

Modified: incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h Wed Jun 12 19:08:50 2013
@@ -27,7 +27,7 @@
 #ifndef ADD_COMMAND_H_
 #define ADD_COMMAND_H_
 
-COMMAND addCommand_create(bundle_context_t context);
-void addCommand_destroy(COMMAND command);
+command_pt addCommand_create(bundle_context_pt context);
+void addCommand_destroy(command_pt command);
 
 #endif /* ADD_COMMAND_H_ */

Modified: incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h Wed Jun 12 19:08:50 2013
@@ -27,7 +27,7 @@
 #ifndef SQRT_COMMAND_H_
 #define SQRT_COMMAND_H_
 
-COMMAND sqrtCommand_create(bundle_context_t context);
-void sqrtCommand_destroy(COMMAND command);
+command_pt sqrtCommand_create(bundle_context_pt context);
+void sqrtCommand_destroy(command_pt command);
 
 #endif /* SQRT_COMMAND_H_ */

Modified: incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h Wed Jun 12 19:08:50 2013
@@ -27,7 +27,7 @@
 #ifndef SUB_COMMAND_H_
 #define SUB_COMMAND_H_
 
-COMMAND subCommand_create(bundle_context_t context);
-void subCommand_destroy(COMMAND command);
+command_pt subCommand_create(bundle_context_pt context);
+void subCommand_destroy(command_pt command);
 
 #endif /* SUB_COMMAND_H_ */

Modified: incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c Wed Jun 12 19:08:50 2013
@@ -36,14 +36,14 @@
 #include "example_service.h"
 
 
-void addCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
-celix_status_t addCommand_isNumeric(COMMAND command, char *number, bool *ret);
+void addCommand_execute(command_pt command, char * line, void (*out)(char *), void (*err)(char *));
+celix_status_t addCommand_isNumeric(command_pt command, char *number, bool *ret);
 
-COMMAND addCommand_create(bundle_context_t context) {
+command_pt addCommand_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 = "add";
@@ -54,12 +54,12 @@ COMMAND addCommand_create(bundle_context
     return command;
 }
 
-void addCommand_destroy(COMMAND command) {
+void addCommand_destroy(command_pt command) {
 }
 
-void addCommand_execute(COMMAND command, char *line, void (*out)(char *), void (*err)(char *)) {
+void addCommand_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;
 
     status = bundleContext_getServiceReference(command->bundleContext, (char *) EXAMPLE_SERVICE, &exampleService);
     if (status == CELIX_SUCCESS) {
@@ -72,7 +72,7 @@ void addCommand_execute(COMMAND command,
 			char *bStr = apr_strtok(NULL, " ", &token);
 			addCommand_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);
@@ -106,7 +106,7 @@ void addCommand_execute(COMMAND command,
     //return status;
 }
 
-celix_status_t addCommand_isNumeric(COMMAND command, char *number, bool *ret) {
+celix_status_t addCommand_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/calc_shell_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c (original)
+++ incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c Wed Jun 12 19:08:50 2013
@@ -36,17 +36,17 @@
 #include "sqrt_command.h"
 
 struct activator {
-	service_registration_t addCommand;
-	COMMAND addCmd;
+	service_registration_pt addCommand;
+	command_pt addCmd;
 
-	service_registration_t subCommand;
-	COMMAND subCmd;
+	service_registration_pt subCommand;
+	command_pt subCmd;
 
-	service_registration_t sqrtCommand;
-	COMMAND sqrtCmd;
+	service_registration_pt sqrtCommand;
+	command_pt sqrtCmd;
 };
 
-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 *pool = NULL;
 	status = bundleContext_getMemoryPool(context, &pool);
@@ -68,7 +68,7 @@ celix_status_t bundleActivator_create(bu
 	return CELIX_SUCCESS;
 }
 
-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 = (struct activator *) userData;
@@ -85,7 +85,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 = (struct activator *) userData;
 	serviceRegistration_unregister(activator->addCommand);
@@ -101,7 +101,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) {
 	return CELIX_SUCCESS;
 }
 



Mime
View raw message