You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/04/14 08:14:07 UTC
[6/8] celix git commit: CELIX-408: Fixes some issues with OSX
CELIX-408: Fixes some issues with OSX
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/95913dd1
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/95913dd1
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/95913dd1
Branch: refs/heads/develop
Commit: 95913dd1f0e6bdaaa730d2f3abc69a940b713d1f
Parents: 9906d9d
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Wed Apr 12 20:56:57 2017 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Wed Apr 12 20:56:57 2017 +0200
----------------------------------------------------------------------
launcher/private/src/celix_test_runner.cpp | 4 ++--
pubsub/pubsub_admin_udp_mc/private/include/topic_subscription.h | 2 +-
pubsub/pubsub_admin_udp_mc/private/src/pubsub_admin_impl.c | 2 +-
pubsub/pubsub_admin_udp_mc/private/src/topic_subscription.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/95913dd1/launcher/private/src/celix_test_runner.cpp
----------------------------------------------------------------------
diff --git a/launcher/private/src/celix_test_runner.cpp b/launcher/private/src/celix_test_runner.cpp
index d1ea2e6..ae1532f 100644
--- a/launcher/private/src/celix_test_runner.cpp
+++ b/launcher/private/src/celix_test_runner.cpp
@@ -33,7 +33,7 @@ static framework_pt framework = NULL;
int main(int argc, char *argv[]) {
// Perform some minimal command-line option parsing...
- char *cfg = DEFAULT_CONFIG_FILE;
+ const char *cfg = DEFAULT_CONFIG_FILE;
// Set signal handler
(void) signal(SIGINT, shutdown_framework);
@@ -70,4 +70,4 @@ static void shutdown_framework(int signal) {
static void ignore(int signal) {
//ignoring for signal SIGUSR1, SIGUSR2. Can be used to interrupt sleep, etc
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/celix/blob/95913dd1/pubsub/pubsub_admin_udp_mc/private/include/topic_subscription.h
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/private/include/topic_subscription.h b/pubsub/pubsub_admin_udp_mc/private/include/topic_subscription.h
index 1535ae5..a65cb6b 100644
--- a/pubsub/pubsub_admin_udp_mc/private/include/topic_subscription.h
+++ b/pubsub/pubsub_admin_udp_mc/private/include/topic_subscription.h
@@ -49,7 +49,7 @@ celix_status_t pubsub_topicSubscriptionDisconnectPublisher(topic_subscription_pt
celix_status_t pubsub_topicSubscriptionAddSubscriber(topic_subscription_pt ts, pubsub_endpoint_pt subEP);
celix_status_t pubsub_topicSubscriptionRemoveSubscriber(topic_subscription_pt ts, pubsub_endpoint_pt subEP);
-celix_status_t pubsub_topicSubscriptionAddSerializer(topic_subscription_pt ts, pubsub_serializer_service_t* serializerSvc);
+celix_status_t pubsub_topicSubscriptionSetSerializer(topic_subscription_pt ts, pubsub_serializer_service_t* serializerSvc);
celix_status_t pubsub_topicSubscriptionRemoveSerializer(topic_subscription_pt ts, pubsub_serializer_service_t* serializerSvc);
celix_status_t pubsub_topicIncreaseNrSubscribers(topic_subscription_pt subscription);
http://git-wip-us.apache.org/repos/asf/celix/blob/95913dd1/pubsub/pubsub_admin_udp_mc/private/src/pubsub_admin_impl.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/private/src/pubsub_admin_impl.c b/pubsub/pubsub_admin_udp_mc/private/src/pubsub_admin_impl.c
index 3693970..d6f9b09 100644
--- a/pubsub/pubsub_admin_udp_mc/private/src/pubsub_admin_impl.c
+++ b/pubsub/pubsub_admin_udp_mc/private/src/pubsub_admin_impl.c
@@ -666,7 +666,7 @@ celix_status_t pubsubAdmin_setSerializer(pubsub_admin_pt admin, pubsub_serialize
hash_map_iterator_pt subs_iter = hashMapIterator_create(admin->subscriptions);
while(hashMapIterator_hasNext(subs_iter)){
topic_subscription_pt topic_sub = (topic_subscription_pt) hashMapIterator_nextValue(subs_iter);
- pubsub_topicSubscriptionAddSerializer(topic_sub, admin->serializerSvc);
+ pubsub_topicSubscriptionSetSerializer(topic_sub, admin->serializerSvc);
}
hashMapIterator_destroy(subs_iter);
celixThreadMutex_unlock(&admin->subscriptionsLock);
http://git-wip-us.apache.org/repos/asf/celix/blob/95913dd1/pubsub/pubsub_admin_udp_mc/private/src/topic_subscription.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/private/src/topic_subscription.c b/pubsub/pubsub_admin_udp_mc/private/src/topic_subscription.c
index a424112..6d4c22f 100644
--- a/pubsub/pubsub_admin_udp_mc/private/src/topic_subscription.c
+++ b/pubsub/pubsub_admin_udp_mc/private/src/topic_subscription.c
@@ -550,7 +550,7 @@ static void* udp_recv_thread_func(void * arg) {
while (sub->running) {
int nfds = 0;
if(nfds > 0) {
- pubsub_udp_msg_pt udpMsg = NULL;
+ pubsub_udp_msg_t* udpMsg = NULL;
process_msg(sub, udpMsg);
}
}