Author: abroekhuis
Date: Wed Oct 2 09:08:14 2013
New Revision: 1528387
URL: http://svn.apache.org/r1528387
Log:
CELIX-56, CELIX-57: Fixed several small code issues
Modified:
incubator/celix/trunk/framework/private/include/version_range_private.h
incubator/celix/trunk/framework/private/src/bundle.c
incubator/celix/trunk/framework/private/src/bundle_cache.c
incubator/celix/trunk/framework/private/src/bundle_revision.c
incubator/celix/trunk/framework/private/src/framework.c
incubator/celix/trunk/framework/private/src/properties.c
incubator/celix/trunk/framework/private/src/service_registry.c
incubator/celix/trunk/framework/private/src/service_tracker.c
incubator/celix/trunk/framework/private/src/version.c
incubator/celix/trunk/framework/private/src/wire.c
incubator/celix/trunk/framework/private/test/framework_test.c
incubator/celix/trunk/framework/private/test/version_range_test.cpp
incubator/celix/trunk/framework/private/test/version_test.cpp
incubator/celix/trunk/framework/public/include/version.h
incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
incubator/celix/trunk/remote_shell/private/src/shell_mediator.c
incubator/celix/trunk/utils/private/test/array_list_test.cpp
Modified:
incubator/celix/trunk/framework/private/include/version_range_private.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/version_range_private.h?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/version_range_private.h
(original)
+++ incubator/celix/trunk/framework/private/include/version_range_private.h Wed
Oct 2 09:08:14 2013
@@ -31,9 +31,9 @@
#include "version_range.h"
struct versionRange {
- version_t low;
+ version_pt low;
bool isLowInclusive;
- version_t high;
+ version_pt high;
bool isHighInclusive;
};
Modified: incubator/celix/trunk/framework/private/src/bundle.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle.c Wed Oct 2 09:08:14
2013
@@ -536,7 +536,7 @@ celix_status_t bundle_unlock(bundle_pt b
apr_thread_mutex_lock(bundle->lock);
- if ((bundle->lockCount == 0)) {
+ if (bundle->lockCount == 0) {
*unlocked = false;
} else {
status = thread_equalsSelf(bundle->lockThread, &equals);
Modified: incubator/celix/trunk/framework/private/src/bundle_cache.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle_cache.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle_cache.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle_cache.c Wed Oct 2
09:08:14 2013
@@ -48,7 +48,7 @@ static apr_status_t bundleCache_destroy(
celix_status_t bundleCache_create(properties_pt configurationMap, apr_pool_t
*mp, bundle_cache_pt *bundle_cache) {
celix_status_t status;
- bundle_cache_pt cache;
+ bundle_cache_pt cache;
cache = (bundle_cache_pt) apr_palloc(mp, (sizeof(*cache)));
if (cache == NULL) {
Modified: incubator/celix/trunk/framework/private/src/bundle_revision.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle_revision.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle_revision.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle_revision.c Wed Oct 2
09:08:14 2013
@@ -107,5 +107,5 @@ celix_status_t bundleRevision_getRoot(bu
} else {
*root = revision->root;
}
- return CELIX_SUCCESS;
+ return status;
}
Modified: incubator/celix/trunk/framework/private/src/framework.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Wed Oct 2 09:08:14
2013
@@ -1213,7 +1213,6 @@ celix_status_t fw_registerService(framew
arrayList_create(pool, &infos);
for (i = 0; i < arrayList_size(framework->serviceListeners);
i++) {
fw_service_listener_pt listener
=(fw_service_listener_pt) arrayList_get(framework->serviceListeners, i);
-
apr_pool_t *pool;
bundle_context_pt context;
listener_hook_info_pt info;
Modified: incubator/celix/trunk/framework/private/src/properties.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/properties.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/properties.c (original)
+++ incubator/celix/trunk/framework/private/src/properties.c Wed Oct 2
09:08:14 2013
@@ -30,7 +30,7 @@
#include "properties.h"
#include "utils.h"
-properties_t properties_create(void) {
+properties_pt properties_create(void) {
return hashMap_create(utils_stringHash, utils_stringHash,
utils_stringEquals, utils_stringEquals);
}
Modified: incubator/celix/trunk/framework/private/src/service_registry.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_registry.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registry.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registry.c Wed Oct 2
09:08:14 2013
@@ -72,6 +72,7 @@ celix_status_t serviceRegistry_getUsageC
unsigned int i;
for (i = 0; (usages != NULL) && (i < arrayList_size(usages)); i++) {
usage_count_pt usage = (usage_count_pt) arrayList_get(usages,
i);
+ // @TODO use reference_equals!
if (usage->reference == reference) {
*usageCount = usage;
break;
@@ -191,7 +192,6 @@ celix_status_t serviceRegistry_getRegist
}
}
}
- return status;
}
return status;
}
Modified: incubator/celix/trunk/framework/private/src/service_tracker.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_tracker.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_tracker.c (original)
+++ incubator/celix/trunk/framework/private/src/service_tracker.c Wed Oct 2
09:08:14 2013
@@ -53,7 +53,7 @@ struct tracked {
typedef struct tracked * tracked_pt;
static apr_status_t serviceTracker_destroy(void *trackerP);
-static void * serviceTracker_addingService(service_tracker_pt tracker,
service_reference_pt reference);
+static celix_status_t serviceTracker_addingService(service_tracker_pt tracker,
service_reference_pt reference, void **service);
static celix_status_t serviceTracker_track(service_tracker_pt tracker,
service_reference_pt reference, service_event_pt event);
static celix_status_t serviceTracker_untrack(service_tracker_pt tracker,
service_reference_pt reference, service_event_pt event);
@@ -103,7 +103,9 @@ celix_status_t serviceTracker_createWith
apr_status_t serviceTracker_destroy(void *trackerP) {
service_tracker_pt tracker = (service_tracker_pt) trackerP;
- bundleContext_removeServiceListener(tracker->context,
tracker->listener);
+ if (tracker->listener != NULL) {
+ bundleContext_removeServiceListener(tracker->context,
tracker->listener);
+ }
arrayList_destroy(tracker->tracked);
return APR_SUCCESS;
@@ -237,7 +239,7 @@ void serviceTracker_serviceChanged(servi
}
}
-celix_status_t serviceTracker_track(service_tracker_pt tracker,
service_reference_pt reference, service_event_pt event) {
+static celix_status_t serviceTracker_track(service_tracker_pt tracker,
service_reference_pt reference, service_event_pt event) {
celix_status_t status = CELIX_SUCCESS;
tracked_pt tracked = NULL;
@@ -254,25 +256,26 @@ celix_status_t serviceTracker_track(serv
}
if (found) {
- void * service = serviceTracker_addingService(tracker,
reference);
- if (service != NULL) {
- tracked = (tracked_pt) malloc(sizeof(*tracked));
- tracked->reference = reference;
- tracked->service = service;
- arrayList_add(tracker->tracked, tracked);
- if (tracker->customizer != NULL) {
- void *handle = NULL;
- added_callback_pt function = NULL;
-
-
serviceTrackerCustomizer_getHandle(tracker->customizer, &handle);
-
serviceTrackerCustomizer_getAddedFunction(tracker->customizer, &function);
+ void * service = NULL;
+ status = serviceTracker_addingService(tracker, reference,
&service);
+ if (status == CELIX_SUCCESS) {
+ if (service != NULL) {
+ tracked = (tracked_pt) malloc(sizeof(*tracked));
+ tracked->reference = reference;
+ tracked->service = service;
+ arrayList_add(tracker->tracked, tracked);
+ if (tracker->customizer != NULL) {
+ void *handle = NULL;
+ added_callback_pt function = NULL;
- if (function != NULL) {
- function(handle, reference, service);
+
serviceTrackerCustomizer_getHandle(tracker->customizer, &handle);
+
serviceTrackerCustomizer_getAddedFunction(tracker->customizer, &function);
+ if (function != NULL) {
+ function(handle, reference,
service);
+ }
}
}
}
-
} else {
if (tracker->customizer != NULL) {
void *handle = NULL;
@@ -290,29 +293,32 @@ celix_status_t serviceTracker_track(serv
return status;
}
-void * serviceTracker_addingService(service_tracker_pt tracker,
service_reference_pt reference) {
- void *svc = NULL;
+static celix_status_t serviceTracker_addingService(service_tracker_pt
tracker, service_reference_pt reference, void **service) {
+ celix_status_t status = CELIX_SUCCESS;
if (tracker->customizer != NULL) {
void *handle = NULL;
adding_callback_pt function = NULL;
- serviceTrackerCustomizer_getHandle(tracker->customizer,
&handle);
- serviceTrackerCustomizer_getAddingFunction(tracker->customizer,
&function);
-
- if (function != NULL) {
- function(handle, reference, &svc);
+ status =
serviceTrackerCustomizer_getHandle(tracker->customizer, &handle);
+ if (status == CELIX_SUCCESS) {
+ status =
serviceTrackerCustomizer_getAddingFunction(tracker->customizer, &function);
+ if (status == CELIX_SUCCESS) {
+ if (function != NULL) {
+ status = function(handle, reference,
service);
+ }
+ }
} else {
- bundleContext_getService(tracker->context, reference,
&svc);
+ status = bundleContext_getService(tracker->context,
reference, service);
}
} else {
- bundleContext_getService(tracker->context, reference, &svc);
+ status = bundleContext_getService(tracker->context, reference,
service);
}
- return svc;
+ return status;
}
-celix_status_t serviceTracker_untrack(service_tracker_pt tracker,
service_reference_pt reference, service_event_pt event) {
+static celix_status_t serviceTracker_untrack(service_tracker_pt tracker,
service_reference_pt reference, service_event_pt event) {
celix_status_t status = CELIX_SUCCESS;
tracked_pt tracked = NULL;
unsigned int i;
@@ -323,10 +329,7 @@ celix_status_t serviceTracker_untrack(se
tracked = (tracked_pt) arrayList_get(tracker->tracked, i);
serviceReference_equals(reference, tracked->reference, &equals);
if (equals) {
- if (tracked != NULL) {
- arrayList_remove(tracker->tracked, i);
- status =
bundleContext_ungetService(tracker->context, reference, &result);
- }
+ arrayList_remove(tracker->tracked, i);
if (status == CELIX_SUCCESS) {
if (tracker->customizer != NULL) {
void *handle = NULL;
@@ -338,10 +341,10 @@ celix_status_t serviceTracker_untrack(se
if (function != NULL) {
status = function(handle,
reference, tracked->service);
} else {
- status =
bundleContext_ungetService(tracker->tracker->context, reference, &result);
+ status =
bundleContext_ungetService(tracker->context, reference, &result);
}
} else {
- status =
bundleContext_ungetService(tracker->tracker->context, reference, &result);
+ status =
bundleContext_ungetService(tracker->context, reference, &result);
}
free(tracked);
break;
Modified: incubator/celix/trunk/framework/private/src/version.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/version.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/version.c (original)
+++ incubator/celix/trunk/framework/private/src/version.c Wed Oct 2 09:08:14
2013
@@ -39,7 +39,7 @@ celix_status_t version_createVersion(apr
if (*version != NULL || pool == NULL) {
status = CELIX_ILLEGAL_ARGUMENT;
} else {
- *version = (version_t) apr_palloc(pool, sizeof(**version));
+ *version = (version_pt) apr_palloc(pool, sizeof(**version));
if (!*version) {
status = CELIX_ENOMEM;
} else {
@@ -178,35 +178,31 @@ celix_status_t version_createEmptyVersio
return version_createVersion(pool, 0, 0, 0, "", version);
}
-<<<<<<< HEAD
-celix_status_t version_compareTo(version_pt version, version_pt compare, int
*result) {
-=======
-celix_status_t version_getMajor(version_t version, int *major) {
+celix_status_t version_getMajor(version_pt version, int *major) {
celix_status_t status = CELIX_SUCCESS;
*major = version->major;
return status;
}
-celix_status_t version_getMinor(version_t version, int *minor) {
+celix_status_t version_getMinor(version_pt version, int *minor) {
celix_status_t status = CELIX_SUCCESS;
*minor = version->minor;
return status;
}
-celix_status_t version_getMicro(version_t version, int *micro) {
+celix_status_t version_getMicro(version_pt version, int *micro) {
celix_status_t status = CELIX_SUCCESS;
*micro = version->micro;
return status;
}
-celix_status_t version_getQualifier(version_t version, char **qualifier) {
+celix_status_t version_getQualifier(version_pt version, char **qualifier) {
celix_status_t status = CELIX_SUCCESS;
*qualifier = version->qualifier;
return status;
}
-celix_status_t version_compareTo(version_t version, version_t compare, int
*result) {
->>>>>>> CELIX-55: Added tests, removed old unused files (test frameworks etc).
+celix_status_t version_compareTo(version_pt version, version_pt compare, int
*result) {
celix_status_t status = CELIX_SUCCESS;
if (compare == version) {
*result = 0;
Modified: incubator/celix/trunk/framework/private/src/wire.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/wire.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/wire.c (original)
+++ incubator/celix/trunk/framework/private/src/wire.c Wed Oct 2 09:08:14 2013
@@ -44,7 +44,7 @@ celix_status_t wire_create(apr_pool_t *p
if (*wire != NULL || pool == NULL) {
status = CELIX_ILLEGAL_ARGUMENT;
} else {
- (*wire) = (wire_t) apr_palloc(pool, sizeof(**wire));
+ (*wire) = (wire_pt) apr_palloc(pool, sizeof(**wire));
if (!*wire) {
status = CELIX_ENOMEM;
} else {
Modified: incubator/celix/trunk/framework/private/test/framework_test.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/framework_test.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/framework_test.c (original)
+++ incubator/celix/trunk/framework/private/test/framework_test.c Wed Oct 2
09:08:14 2013
@@ -28,7 +28,7 @@
#include <stddef.h>
-#include "Basic.h"
+#include "CUnit/Basic.h"
#include "framework.h"
void test_framework_create(void) {
@@ -59,7 +59,7 @@ void frameworkTest_startFw() {
if (s != APR_SUCCESS) {
CU_FAIL("Could not create memory pool");
} else {
- framework_t framework = NULL;
+ framework_pt framework = NULL;
if (framework_create(&framework, memoryPool, NULL) ==
CELIX_SUCCESS) {
if (fw_init(framework) == CELIX_SUCCESS) {
if (framework_start(framework) ==
CELIX_SUCCESS) {
@@ -91,7 +91,7 @@ void frameworkTest_installBundle() {
if (s != APR_SUCCESS) {
CU_FAIL("Could not create memory pool");
} else {
- framework_t framework = NULL;
+ framework_pt framework = NULL;
if (framework_create(&framework, memoryPool, NULL) ==
CELIX_SUCCESS) {
if (fw_init(framework) == CELIX_SUCCESS) {
if (framework_start(framework) ==
CELIX_SUCCESS) {
Modified: incubator/celix/trunk/framework/private/test/version_range_test.cpp
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/version_range_test.cpp?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/version_range_test.cpp
(original)
+++ incubator/celix/trunk/framework/private/test/version_range_test.cpp Wed Oct
2 09:08:14 2013
@@ -38,14 +38,14 @@ extern "C"
#include "version_range_private.h"
#include "version_private.h"
- celix_status_t version_createEmptyVersion(apr_pool_t *pool, version_t
*version) {
+ celix_status_t version_createEmptyVersion(apr_pool_t *pool, version_pt
*version) {
mock_c()->actualCall("version_createEmptyVersion")
->withPointerParameters("pool", pool)
->_andPointerOutputParameters("version", (void
**) version);
return CELIX_SUCCESS;
}
- 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) {
// *result = (int) mock_c()->getData("result").value.intValue;
mock_c()->actualCall("version_compareTo")
->withPointerParameters("version", version)
@@ -54,7 +54,7 @@ extern "C"
return CELIX_SUCCESS;
}
- 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) {
mock_c()->actualCall("version_createVersionFromString")
->withPointerParameters("pool", pool)
->withStringParameters("versionStr", versionStr)
@@ -84,8 +84,8 @@ TEST_GROUP(version_range) {
TEST(version_range, create) {
celix_status_t status = APR_SUCCESS;
- version_range_t range = NULL;
- version_t version = (version_t) apr_palloc(pool, sizeof(*version));
+ version_range_pt range = NULL;
+ version_pt version = (version_pt) apr_palloc(pool, sizeof(*version));
status = versionRange_createVersionRange(pool, version, false, version,
true, &range);
LONGS_EQUAL(CELIX_SUCCESS, status);
@@ -98,8 +98,8 @@ TEST(version_range, create) {
TEST(version_range, createInfinite) {
celix_status_t status = APR_SUCCESS;
- version_range_t range = NULL;
- version_t version = (version_t) apr_palloc(pool, sizeof(*version));
+ version_range_pt range = NULL;
+ version_pt version = (version_pt) apr_palloc(pool, sizeof(*version));
version->major = 1;
version->minor = 2;
version->micro = 3;
@@ -119,18 +119,18 @@ TEST(version_range, createInfinite) {
TEST(version_range, isInRange) {
celix_status_t status = APR_SUCCESS;
- version_range_t range = NULL;
- version_t version = (version_t) apr_palloc(pool, sizeof(*version));
+ version_range_pt range = NULL;
+ version_pt version = (version_pt) apr_palloc(pool, sizeof(*version));
version->major = 1;
version->minor = 2;
version->micro = 3;
- version_t low = (version_t) apr_palloc(pool, sizeof(*low));
+ version_pt low = (version_pt) apr_palloc(pool, sizeof(*low));
low->major = 1;
low->minor = 2;
low->micro = 3;
- version_t high = (version_t) apr_palloc(pool, sizeof(*high));
+ version_pt high = (version_pt) apr_palloc(pool, sizeof(*high));
high->major = 1;
high->minor = 2;
high->micro = 3;
@@ -156,9 +156,9 @@ TEST(version_range, isInRange) {
TEST(version_range, parse) {
celix_status_t status = APR_SUCCESS;
- version_range_t range = NULL;
- version_t low = (version_t) apr_palloc(pool, sizeof(*low));
- version_t high = (version_t) apr_palloc(pool, sizeof(*high));
+ version_range_pt range = NULL;
+ version_pt low = (version_pt) apr_palloc(pool, sizeof(*low));
+ version_pt high = (version_pt) apr_palloc(pool, sizeof(*high));
low->major = 1;
low->minor = 2;
Modified: incubator/celix/trunk/framework/private/test/version_test.cpp
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/version_test.cpp?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/version_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/version_test.cpp Wed Oct 2
09:08:14 2013
@@ -53,7 +53,7 @@ TEST_GROUP(version) {
TEST(version, create) {
- version_t version = NULL;
+ version_pt version = NULL;
celix_status_t status = CELIX_SUCCESS;
std::string str;
@@ -89,7 +89,7 @@ TEST(version, create) {
}
TEST(version, clone) {
- version_t version = NULL, clone = NULL;
+ version_pt version = NULL, clone = NULL;
celix_status_t status = CELIX_SUCCESS;
std::string str;
@@ -106,7 +106,7 @@ TEST(version, clone) {
}
TEST(version, createFromString) {
- version_t version = NULL;
+ version_pt version = NULL;
celix_status_t status = CELIX_SUCCESS;
std::string str;
@@ -185,7 +185,7 @@ TEST(version, createFromString) {
}
TEST(version, createEmptyVersion) {
- version_t version = NULL;
+ version_pt version = NULL;
celix_status_t status = CELIX_SUCCESS;
status = version_createEmptyVersion(pool, &version);
@@ -198,7 +198,7 @@ TEST(version, createEmptyVersion) {
}
TEST(version, getters) {
- version_t version = NULL;
+ version_pt version = NULL;
celix_status_t status = CELIX_SUCCESS;
std::string str;
int major, minor, micro;
@@ -223,7 +223,7 @@ TEST(version, getters) {
}
TEST(version, compare) {
- version_t version = NULL, compare = NULL;
+ version_pt version = NULL, compare = NULL;
celix_status_t status = CELIX_SUCCESS;
std::string str;
int result;
@@ -266,7 +266,7 @@ TEST(version, compare) {
}
TEST(version, toString) {
- version_t version = NULL, compare = NULL;
+ version_pt version = NULL, compare = NULL;
celix_status_t status = CELIX_SUCCESS;
std::string str;
char *result = NULL;
Modified: incubator/celix/trunk/framework/public/include/version.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/version.h?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/version.h (original)
+++ incubator/celix/trunk/framework/public/include/version.h Wed Oct 2
09:08:14 2013
@@ -117,10 +117,10 @@ celix_status_t version_createVersionFrom
*/
celix_status_t version_createEmptyVersion(apr_pool_t *pool, version_pt
*version);
-celix_status_t version_getMajor(version_t version, int *major);
-celix_status_t version_getMinor(version_t version, int *minor);
-celix_status_t version_getMicro(version_t version, int *micro);
-celix_status_t version_getQualifier(version_t version, char **qualifier);
+celix_status_t version_getMajor(version_pt version, int *major);
+celix_status_t version_getMinor(version_pt version, int *minor);
+celix_status_t version_getMicro(version_pt version, int *micro);
+celix_status_t version_getQualifier(version_pt version, char **qualifier);
/**
* Compares this <code>Version</code> object to another object.
Modified:
incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
---
incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
(original)
+++
incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
Wed Oct 2 09:08:14 2013
@@ -107,8 +107,8 @@ celix_status_t discovery_create(apr_pool
(*discovery)->context = context;
(*discovery)->pool = pool;
(*discovery)->listenerReferences =
hashMap_create(serviceReference_hashCode, NULL, serviceReference_equals2, NULL);
- (*discovery)->discoveredServices = hashMap_create(string_hash,
NULL, string_equals, NULL);
- (*discovery)->disclosedServices = hashMap_create(string_hash,
NULL, string_equals, NULL);
+ (*discovery)->discoveredServices =
hashMap_create(utils_stringHash, NULL, utils_stringEquals, NULL);
+ (*discovery)->disclosedServices =
hashMap_create(utils_stringHash, NULL, utils_stringEquals, NULL);
(*discovery)->running = true;
(*discovery)->browseRef = NULL;
(*discovery)->discoveryPort = NULL;
Modified: incubator/celix/trunk/remote_shell/private/src/shell_mediator.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/shell_mediator.c?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/shell_mediator.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/shell_mediator.c Wed Oct 2
09:08:14 2013
@@ -62,7 +62,7 @@ celix_status_t shellMediator_create(apr_
celix_status_t status = CELIX_SUCCESS;
service_tracker_customizer_pt customizer = NULL;
- (*instance) = (shell_mediator_t) apr_palloc(pool, sizeof(**instance));
+ (*instance) = (shell_mediator_pt) apr_palloc(pool, sizeof(**instance));
if ((*instance) != NULL) {
apr_pool_pre_cleanup_register(pool, *instance,
shellMediator_cleanup);
Modified: incubator/celix/trunk/utils/private/test/array_list_test.cpp
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/test/array_list_test.cpp?rev=1528387&r1=1528386&r2=1528387&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/test/array_list_test.cpp (original)
+++ incubator/celix/trunk/utils/private/test/array_list_test.cpp Wed Oct 2
09:08:14 2013
@@ -20,7 +20,7 @@ int main(int argc, char** argv) {
}
TEST_GROUP(array_list) {
- array_list_t list;
+ array_list_pt list;
apr_pool_t *pool;
void setup(void) {
@@ -87,7 +87,7 @@ TEST(array_list, clone) {
LONGS_EQUAL(16, list->capacity);
LONGS_EQUAL(12, list->size);
- array_list_t clone = NULL;
+ array_list_pt clone = NULL;
clone = arrayList_clone(pool, list);
LONGS_EQUAL(16, clone->capacity);
