Repository: celix Updated Branches: refs/heads/develop 6083327d5 -> 18c35d657
Fixes some clang issues Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/18c35d65 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/18c35d65 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/18c35d65 Branch: refs/heads/develop Commit: 18c35d6573fdeb1d0ef7bde78abe21eb08dd27dd Parents: 6083327 Author: Pepijn Noltes <[email protected]> Authored: Wed Mar 21 15:03:09 2018 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Wed Mar 21 15:03:09 2018 +0100 ---------------------------------------------------------------------- pubsub/pubsub_discovery/src/pubsub_discovery_impl.h | 6 ++---- pubsub/pubsub_spi/src/pubsub_utils.c | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/18c35d65/pubsub/pubsub_discovery/src/pubsub_discovery_impl.h ---------------------------------------------------------------------- diff --git a/pubsub/pubsub_discovery/src/pubsub_discovery_impl.h b/pubsub/pubsub_discovery/src/pubsub_discovery_impl.h index 3d25b1c..eaf8e85 100644 --- a/pubsub/pubsub_discovery/src/pubsub_discovery_impl.h +++ b/pubsub/pubsub_discovery/src/pubsub_discovery_impl.h @@ -37,7 +37,7 @@ struct watcher_info { int nr_references; }; -typedef struct pubsub_discovery { +struct pubsub_discovery { bundle_context_pt context; celix_thread_mutex_t discoveredPubsMutex; @@ -52,9 +52,7 @@ typedef struct pubsub_discovery { etcd_writer_pt writer; bool verbose; -} pubsub_discovery_t; - -typedef struct pubsub_discovery *pubsub_discovery_pt; +}; celix_status_t pubsub_discovery_create(bundle_context_pt context, pubsub_discovery_pt* node_discovery); http://git-wip-us.apache.org/repos/asf/celix/blob/18c35d65/pubsub/pubsub_spi/src/pubsub_utils.c ---------------------------------------------------------------------- diff --git a/pubsub/pubsub_spi/src/pubsub_utils.c b/pubsub/pubsub_spi/src/pubsub_utils.c index d5909ed..2b38a17 100644 --- a/pubsub/pubsub_spi/src/pubsub_utils.c +++ b/pubsub/pubsub_spi/src/pubsub_utils.c @@ -71,7 +71,9 @@ celix_status_t pubsub_getPubSubInfoFromFilter(const char* filterstr, char **topi if (topic != NULL && objectClass != NULL && strncmp(objectClass, PUBSUB_PUBLISHER_SERVICE_NAME, 128) == 0) { *topicOut = strdup(topic); - *scopeOut = strdup(scope); + if (scope != NULL) { + *scopeOut = strdup(scope); + } } else { *topicOut = NULL; *scopeOut = NULL;
