You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by rl...@apache.org on 2019/01/03 20:34:13 UTC
[celix] branch develop updated: Resolved typos
This is an automated email from the ASF dual-hosted git repository.
rlenferink pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/develop by this push:
new 61f124e Resolved typos
61f124e is described below
commit 61f124e41f10fd059edb00e5abfa8b242b47973e
Author: Roy Lenferink <rl...@apache.org>
AuthorDate: Thu Jan 3 21:33:56 2019 +0100
Resolved typos
---
BUILDING | 2 +-
bundles/config_admin/README.md | 4 +-
.../service/private/src/managed_service_tracker.c | 2 +-
bundles/deployment_admin/src/deployment_admin.c | 8 ++--
bundles/deployment_admin/src/deployment_admin.h | 2 +-
bundles/deployment_admin/src/log_sync.c | 6 +--
.../example/refining_driver/README.txt | 4 +-
.../event_admin/private/src/event_admin_impl.c | 2 +-
bundles/pubsub/mock/api/pubsub/publisher_mock.h | 2 +-
bundles/pubsub/mock/tst/pubsubmock_test.cc | 2 +-
.../src/psa_nanomsg_activator.cc | 2 +-
.../src/pubsub_nanomsg_common.h | 2 +-
.../src/pubsub_nanomsg_topic_receiver.cc | 2 +-
bundles/pubsub/pubsub_admin_udp_mc/README.md | 10 ++--
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 16 +++----
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 2 +-
.../src/pubsub_udpmc_topic_sender.c | 2 +-
.../pubsub/pubsub_api/include/pubsub/publisher.h | 2 +-
.../pubsub_discovery/src/pubsub_discovery_impl.c | 4 +-
.../pubsub/pubsub_spi/include/pubsub_constants.h | 6 +--
.../pubsub/pubsub_spi/include/pubsub_endpoint.h | 2 +-
bundles/pubsub/pubsub_spi/src/pubsub_utils.c | 2 +-
.../src/pubsub_topology_manager.c | 2 +-
bundles/remote_services/README.md | 4 +-
.../discovery_common/include/discovery.h | 4 +-
.../src/endpoint_discovery_server.c | 12 ++---
.../discovery_shm/src/discovery_shm.c | 10 ++--
.../calculator_service/src/calculator_impl.h | 10 ++--
.../src/remote_service_admin_dfi.c | 10 ++--
.../include/remote_service_admin_shm_impl.h | 2 +-
.../private/src/remote_service_admin_impl.c | 18 +++----
.../private/test/rsa_client_server_tests.cpp | 4 +-
.../remote_services/remote_services_api/README.md | 2 +-
bundles/remote_services/rsa_spi/README.md | 2 +-
.../rsa_spi/include/endpoint_listener.h | 4 +-
.../remote_services/topology_manager/src/scope.c | 4 +-
bundles/shell/remote_shell/src/remote_shell.c | 2 +-
bundles/shell/shell/include/command.h | 4 +-
bundles/shell/shell/src/activator.c | 2 +-
bundles/shell/shell/src/help_command.c | 2 +-
bundles/shell/shell_tui/README.md | 2 +-
documents/building/README.md | 2 +-
documents/cmake_commands/README.md | 6 +--
documents/subprojects/README.md | 2 +-
.../celix-examples/services_example_c/README.md | 4 +-
libs/dependency_manager/README.md | 4 +-
libs/dependency_manager/TODO.md | 2 +-
libs/dependency_manager/api/dm_activator.h | 2 +-
libs/dependency_manager_cxx/TODO.md | 4 +-
libs/dfi/include/dyn_function.h | 4 +-
libs/dfi/src/dyn_function.c | 2 +-
libs/dfi/src/dyn_interface.c | 2 +-
libs/dfi/test/dyn_closure_tests.cpp | 2 +-
libs/etcdlib/README.md | 2 +-
libs/etcdlib/src/etcd.c | 6 +--
libs/framework/include/celix/dm/Component.h | 2 +-
.../framework/include/celix/dm/ServiceDependency.h | 4 +-
libs/framework/include/celix_bundle_activator.h | 2 +-
libs/framework/include/celix_bundle_context.h | 8 ++--
.../include/celix_dm_service_dependency.h | 4 +-
libs/framework/include/celix_launcher.h | 2 +-
libs/framework/include/dm_activator.h | 2 +-
libs/framework/include/dm_service_dependency.h | 4 +-
.../private/test/service_registration_test.cpp | 32 ++++++-------
.../private/test/service_registry_test.cpp | 2 +-
libs/framework/src/bundle_cache.h | 2 +-
libs/framework/src/bundle_context.c | 4 +-
libs/framework/src/celix_launcher.c | 8 ++--
libs/framework/src/celix_log.c | 2 +-
libs/framework/src/dm_event.c | 2 +-
libs/framework/src/dm_service_dependency.c | 2 +-
libs/framework/src/framework.c | 4 +-
libs/framework/src/service_reference.c | 4 +-
libs/framework/src/service_registry.c | 4 +-
libs/framework/tst/multiple_frameworks_test.cpp | 6 +--
libs/framework/tst/single_framework_test.cpp | 2 +-
libs/utils/docs/thpool/FAQ.md | 6 +--
libs/utils/include/celix_threads.h | 2 +-
libs/utils/private/test/celix_threads_test.cpp | 12 ++---
libs/utils/private/test/hash_map_test.cpp | 56 +++++++++++-----------
libs/utils/private/test/linked_list_test.cpp | 2 +-
libs/utils/src/celix_threads.c | 2 +-
misc/roadmap/roadmap.md | 3 +-
83 files changed, 207 insertions(+), 208 deletions(-)
diff --git a/BUILDING b/BUILDING
index 508a536..08c8f07 100644
--- a/BUILDING
+++ b/BUILDING
@@ -13,4 +13,4 @@ Notes
Building
--------
-See documents/building/README.md for howto build Apache Celix
+See documents/building/README.md for how-to build Apache Celix
diff --git a/bundles/config_admin/README.md b/bundles/config_admin/README.md
index 607a810..f3dce1f 100644
--- a/bundles/config_admin/README.md
+++ b/bundles/config_admin/README.md
@@ -21,7 +21,7 @@ limitations under the License.
## Introduction
The configuration Admin service allows defining and deploying configuration data to bundles.
-When compared to config.properties it adds the option to update configuration data by providing a persisten storage. It also allows changing configuration data at run-time.
+When compared to config.properties it adds the option to update configuration data by providing a persistent storage. It also allows changing configuration data at run-time.
---
@@ -51,4 +51,4 @@ service.pid
This bundle has to register next to its normal service a managed service that has an update method. This managed service needs to be registered with a properties object that contains the key/value pair service.pid=<PID NAME>.
Use config_admin_tst/example_test as an example (it is better than example_test2)
2. Bundle/application that wants to update the configuration data of the system
- This bundle needs to retrieve the running config_admin service. With this service it can retrieve all configuration objects for all known Persistent Identifiers (PIDs). For each PID, get all properites that need to be updated. See config_admin_test for an example.
+ This bundle needs to retrieve the running config_admin service. With this service it can retrieve all configuration objects for all known Persistent Identifiers (PIDs). For each PID, get all properties that need to be updated. See config_admin_test for an example.
diff --git a/bundles/config_admin/service/private/src/managed_service_tracker.c b/bundles/config_admin/service/private/src/managed_service_tracker.c
index a42d565..c406792 100644
--- a/bundles/config_admin/service/private/src/managed_service_tracker.c
+++ b/bundles/config_admin/service/private/src/managed_service_tracker.c
@@ -493,7 +493,7 @@ celix_status_t managedServiceTracker_asynchUpdated(managed_service_tracker_pt tr
}
-/* ========== IMPLEMENTENTATION ========== */
+/* ========== IMPLEMENTATION ========== */
/* ---------- public ---------- */
diff --git a/bundles/deployment_admin/src/deployment_admin.c b/bundles/deployment_admin/src/deployment_admin.c
index 17e78db..9717ee8 100644
--- a/bundles/deployment_admin/src/deployment_admin.c
+++ b/bundles/deployment_admin/src/deployment_admin.c
@@ -111,7 +111,7 @@ celix_status_t deploymentAdmin_create(bundle_context_pt context, deployment_admi
struct timeval tv;
gettimeofday(&tv,NULL);
(*admin)->auditlogId = tv.tv_sec*(uint64_t)1000000+tv.tv_usec;
- (*admin)->aditlogSeqNr = 0;
+ (*admin)->auditlogSeqNr = 0;
if ((*admin)->targetIdentification == NULL ) {
fw_log(logger, OSGI_FRAMEWORK_LOG_ERROR, "Target name must be set using \"deployment_admin_identification\"");
@@ -228,7 +228,7 @@ static celix_status_t deploymentAdmin_auditEventTargetPropertiesSet(deployment_a
char entry[512];
int entrySize = 0;
- entrySize = snprintf(entry, 512, "%s,%llu,%u,0,%i,%s\n", admin->targetIdentification, admin->auditlogId, admin->aditlogSeqNr++, DEPLOYMENT_ADMIN_AUDIT_EVENT__TARGETPROPERTIES_SET, tags);
+ entrySize = snprintf(entry, 512, "%s,%llu,%u,0,%i,%s\n", admin->targetIdentification, admin->auditlogId, admin->auditlogSeqNr++, DEPLOYMENT_ADMIN_AUDIT_EVENT__TARGETPROPERTIES_SET, tags);
if (entrySize >= 512) {
status = CELIX_BUNDLE_EXCEPTION;
@@ -247,7 +247,7 @@ static celix_status_t deploymentAdmin_auditEventFrameworkStarted(deployment_admi
char entry[512];
int entrySize = 0;
- entrySize = snprintf(entry, 512, "%s,%llu,%u,0,%i\n", admin->targetIdentification, admin->auditlogId, admin->aditlogSeqNr++, DEPLOYMENT_ADMIN_AUDIT_EVENT__FRAMEWORK_STARTED);
+ entrySize = snprintf(entry, 512, "%s,%llu,%u,0,%i\n", admin->targetIdentification, admin->auditlogId, admin->auditlogSeqNr++, DEPLOYMENT_ADMIN_AUDIT_EVENT__FRAMEWORK_STARTED);
if (entrySize >= 512) {
status = CELIX_BUNDLE_EXCEPTION;
@@ -285,7 +285,7 @@ static void *deploymentAdmin_poll(void *deploymentAdmin) {
// TODO
// We do not yet support fix packages
- // Check string lenght!
+ // Check string length!
// snprintf(request, length, "%s/%s?current=%s", admin->pollUrl, last, admin->current);
snprintf(request, length, "%s/%s", admin->pollUrl, last);
diff --git a/bundles/deployment_admin/src/deployment_admin.h b/bundles/deployment_admin/src/deployment_admin.h
index a7e3a39..bdf8117 100644
--- a/bundles/deployment_admin/src/deployment_admin.h
+++ b/bundles/deployment_admin/src/deployment_admin.h
@@ -42,7 +42,7 @@ struct deployment_admin {
char *pollUrl;
char *auditlogUrl;
unsigned long long auditlogId;
- unsigned int aditlogSeqNr;
+ unsigned int auditlogSeqNr;
};
typedef enum {
diff --git a/bundles/deployment_admin/src/log_sync.c b/bundles/deployment_admin/src/log_sync.c
index 242beea..b65a131 100644
--- a/bundles/deployment_admin/src/log_sync.c
+++ b/bundles/deployment_admin/src/log_sync.c
@@ -59,7 +59,7 @@ struct log_descriptor {
typedef struct log_descriptor *log_descriptor_pt;
celix_status_t logSync_queryLog(log_sync_pt logSync, char *targetId, long logId, char **queryReply);
-static size_t logSync_readQeury(void *contents, size_t size, size_t nmemb, void *userp);
+static size_t logSync_readQuery(void *contents, size_t size, size_t nmemb, void *userp);
static void *logSync_synchronize(void *logSyncP);
celix_status_t logSync_create(char *targetId, log_store_pt store, log_sync_pt *logSync) {
@@ -173,7 +173,7 @@ celix_status_t logSync_queryLog(log_sync_pt logSync, char *targetId, long logId,
if (curl) {
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_URL, query);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, logSync_readQeury);
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, logSync_readQuery);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &chunk);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
res = curl_easy_perform(curl);
@@ -190,7 +190,7 @@ celix_status_t logSync_queryLog(log_sync_pt logSync, char *targetId, long logId,
return status;
}
-static size_t logSync_readQeury(void *contents, size_t size, size_t nmemb, void *userp) {
+static size_t logSync_readQuery(void *contents, size_t size, size_t nmemb, void *userp) {
size_t realsize = size * nmemb;
struct MemoryStruct *mem = (struct MemoryStruct *)userp;
diff --git a/bundles/device_access/example/refining_driver/README.txt b/bundles/device_access/example/refining_driver/README.txt
index d8697af..681e60e 100644
--- a/bundles/device_access/example/refining_driver/README.txt
+++ b/bundles/device_access/example/refining_driver/README.txt
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-A refining driver is a driver which is able to attache to certained device services and
-as result publishes differerent - refined - device services.
+A refining driver is a driver which is able to attach to certained device services and
+as result publishes different - refined - device services.
This example will attach to device services with a "char" device category and publish
- for every char device services found - a "word" device services.
diff --git a/bundles/event_admin/event_admin/private/src/event_admin_impl.c b/bundles/event_admin/event_admin/private/src/event_admin_impl.c
index a7eeb49..790bd46 100644
--- a/bundles/event_admin/event_admin/private/src/event_admin_impl.c
+++ b/bundles/event_admin/event_admin/private/src/event_admin_impl.c
@@ -109,7 +109,7 @@ celix_status_t eventAdmin_findHandlersByTopic(event_admin_pt event_admin, const
if (channel != NULL) {
logHelper_log(*event_admin->loghelper, OSGI_LOGSERVICE_INFO, "found channel: %s", topic);
if (channel->eventHandlers != NULL && !hashMap_isEmpty(channel->eventHandlers)) {
- // iterate throught the handlers and add them to the array list for result.
+ // iterate through the handlers and add them to the array list for result.
hash_map_iterator_pt hashmap_iterator = hashMapIterator_create(channel->eventHandlers);
while (hashMapIterator_hasNext(hashmap_iterator)) {
arrayList_add(event_handlers, (event_handler_service_pt) hashMapIterator_nextValue(hashmap_iterator));
diff --git a/bundles/pubsub/mock/api/pubsub/publisher_mock.h b/bundles/pubsub/mock/api/pubsub/publisher_mock.h
index 45c69db..654d3a0 100644
--- a/bundles/pubsub/mock/api/pubsub/publisher_mock.h
+++ b/bundles/pubsub/mock/api/pubsub/publisher_mock.h
@@ -32,7 +32,7 @@ extern "C" {
/*============================================================================
- MOCK - intialize publisher mock
+ MOCK - initialize publisher mock
============================================================================*/
void pubsub_publisherMock_init(pubsub_publisher_t* srv, void* handle);
diff --git a/bundles/pubsub/mock/tst/pubsubmock_test.cc b/bundles/pubsub/mock/tst/pubsubmock_test.cc
index 16f2058..78f2d7d 100644
--- a/bundles/pubsub/mock/tst/pubsubmock_test.cc
+++ b/bundles/pubsub/mock/tst/pubsubmock_test.cc
@@ -70,7 +70,7 @@ TEST(pubsubmock, publishermock) {
//set msg
void *dummyMsg = (void*)0x43;
- srv->send(srv->handle, msgId, dummyMsg); //should satify the expectOneCalls
+ srv->send(srv->handle, msgId, dummyMsg); //should satisfy the expectOneCalls
//srv->send(srv->handle, msgId, dummyMsg); //enabling this should fail the test
}
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc b/bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
index 5e79a43..f738814 100644
--- a/bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
+++ b/bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
@@ -31,7 +31,7 @@ namespace celix { namespace pubsub { namespace nanomsg {
public:
Activator(celix_bundle_context_t *ctx) :
context{ctx},
- L{context, std::string("PSA_NANOMSG_ACIVATOR")},
+ L{context, std::string("PSA_NANOMSG_ACTIVATOR")},
admin(context)
{
}
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h b/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h
index e22b4df..fd3a27f 100644
--- a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h
+++ b/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h
@@ -33,7 +33,7 @@
* 1) A subscription filter.
* This is a 5 char string of the first two chars of scope and topic combined and terminated with a '\0'.
*
- * 2) The pubsub_zmq_msg_header_t is send containg the type id and major/minor version
+ * 2) The pubsub_zmq_msg_header_t is send containing the type id and major/minor version
*
* 3) The actual payload
*/
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc b/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
index 8b8ac38..d35de89 100644
--- a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
+++ b/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
@@ -306,7 +306,7 @@ void pubsub::nanomsg::topic_receiver::recvThread_exec() {
processMsg(&msg->header, msg->payload, recvBytes-sizeof(msg->header));
nn_freemsg(msg);
} else if (recvBytes >= 0) {
- L.ERROR("[PSA_NANOMSG_TR] Error receiving nanmosg msg, size (", recvBytes,") smaller than header\n");
+ L.ERROR("[PSA_NANOMSG_TR] Error receiving nanomsg msg, size (", recvBytes,") smaller than header\n");
} else if (errno == EAGAIN || errno == ETIMEDOUT) {
// no data: go to next cycle
} else if (errno == EINTR) {
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/README.md b/bundles/pubsub/pubsub_admin_udp_mc/README.md
index 7520fef..ff31fc0 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/README.md
+++ b/bundles/pubsub/pubsub_admin_udp_mc/README.md
@@ -29,7 +29,7 @@ fragments are reassembled at the reception side.
### IP Addresses
-To use UDP-multicast 2 IP adresses are needed:
+To use UDP-multicast 2 IP addresses are needed:
1. IP address which is bound to an (ethernet) interface
2. The multicast address (in the range 224.X.X.X - 239.X.X.X)
@@ -39,7 +39,7 @@ When the PubSubAdmin starts it determines the bound IP address. This is done in
1. The first IP number bound to the interface which is set by the "PSA_INTERFACE" property
2. The interfaces are iterated and the first IP number found is used. (typically this is 127.0.0.1 (localhost)
-The Multicass IP address is determined in the order:
+The multicast IP address is determined in the order:
1. If the `PSA_IP` property is defined, this IP will be used as multicast.
2. If the `PSA_MC_PREFIX` property, is defined, this property is used as the first 2 numbers of the multicast address extended with the last 2 numbers of the bound IP.
@@ -50,7 +50,7 @@ The Multicass IP address is determined in the order:
When a publisher request for a topic a TopicSender is created by a ServiceFactory. This TopicSender uses the multicast address as described above with a random chosen portnumber. The combination of the multicast-IP address with the portnumber and protocol(udp) is the endpoint.
This endpoint is published by the PubSubDiscovery within its topic in ETCD (i.e. udp://224.100.10.20:40123).
-A subscriber, interested in the topic, is informed by the the ToplogyManager that there is a new endpoint. The TopicReceiver at the subscriber side creates a listening socket based on this endpoint.
+A subscriber, interested in the topic, is informed by the the TopologyManager that there is a new endpoint. The TopicReceiver at the subscriber side creates a listening socket based on this endpoint.
Now a data-connection is created and data send by the publisher will be received by the subscriber.
@@ -70,8 +70,8 @@ Now a data-connection is created and data send by the publisher will be received
## Shortcomings
1. Per topic a random portnr is used for creating an endpoint. It is theoretical possible that for 2 topic the same endpoint is created.
-2. For every message a 32 bit random message ID is generated to discriminate segments of different messages which could be sent at the same time. It is theoretically possible that there are 2 equal message ID's at the same time. But since the mesage ID is valid only during the transmission of a message (maximum some milliseconds with large messages) this is not very plausible.
-3. When sending large messages, these messages are segmented and sent after each other. This could cause UDP-buffer overflows in the kernel. A solution could be to add a delay between sending of the segements but this will introduce extra latency.
+2. For every message a 32 bit random message ID is generated to discriminate segments of different messages which could be sent at the same time. It is theoretically possible that there are 2 equal message ID's at the same time. But since the message ID is valid only during the transmission of a message (maximum some milliseconds with large messages) this is not very plausible.
+3. When sending large messages, these messages are segmented and sent after each other. This could cause UDP-buffer overflows in the kernel. A solution could be to add a delay between sending of the segments but this will introduce extra latency.
4. A Hash is created, using the message definition, to identify the message type. When 2 messages generate the same hash something will terribly go wrong. A check should be added to prevent this (or another way to identify the message type). This problem is also valid for the other admins.
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c
index 372e386..2d36579 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c
+++ b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c
@@ -34,7 +34,7 @@
#define PUBSUB_UDPMC_MC_IP_DEFAULT "224.100.1.1"
#define PUBSUB_UDPMC_SOCKET_ADDRESS_KEY "udpmc.socket_address"
-#define PUBSUB_UDPMC_SOCKET_PORT_KEY "udpmc.socker_port"
+#define PUBSUB_UDPMC_SOCKET_PORT_KEY "udpmc.socket_port"
#define L_DEBUG(...) \
logHelper_log(psa->log, OSGI_LOGSERVICE_DEBUG, __VA_ARGS__)
@@ -79,7 +79,7 @@ struct pubsub_udpmc_admin {
};
-typedef struct psa_nanomsg_serializer_entry {
+typedef struct psa_udpmc_serializer_entry {
const char *serType;
long svcId;
pubsub_serializer_service_t *svc;
@@ -443,10 +443,10 @@ static celix_status_t pubsub_udpmcAdmin_connectEndpointToReceiver(pubsub_udpmc_a
const char *type = celix_properties_get(endpoint, PUBSUB_ENDPOINT_TYPE, NULL);
const char *eScope = celix_properties_get(endpoint, PUBSUB_ENDPOINT_TOPIC_SCOPE, NULL);
const char *eTopic = celix_properties_get(endpoint, PUBSUB_ENDPOINT_TOPIC_NAME, NULL);
- const char *sockAdress = celix_properties_get(endpoint, PUBSUB_PSA_UDPMC_SOCKET_ADDRESS_KEY, NULL);
+ const char *sockAddress = celix_properties_get(endpoint, PUBSUB_PSA_UDPMC_SOCKET_ADDRESS_KEY, NULL);
long sockPort = celix_properties_getAsLong(endpoint, PUBSUB_PSA_UDPMC_SOCKET_PORT_KEY, -1L);
- if (type == NULL || sockAdress == NULL || sockPort < 0) {
+ if (type == NULL || sockAddress == NULL || sockPort < 0) {
fprintf(stderr, "[PSA UPDMC] Error got endpoint without udpmc socket address/port or endpoint type");
status = CELIX_BUNDLE_EXCEPTION;
} else {
@@ -454,7 +454,7 @@ static celix_status_t pubsub_udpmcAdmin_connectEndpointToReceiver(pubsub_udpmc_a
strncmp(eScope, scope, 1024 * 1024) == 0 &&
strncmp(eTopic, topic, 1024 * 1024) == 0 &&
strncmp(type, PUBSUB_PUBLISHER_ENDPOINT_TYPE, strlen(PUBSUB_PUBLISHER_ENDPOINT_TYPE)) == 0) {
- pubsub_udpmcTopicReceiver_connectTo(receiver, sockAdress, sockPort);
+ pubsub_udpmcTopicReceiver_connectTo(receiver, sockAddress, sockPort);
}
}
@@ -492,10 +492,10 @@ static celix_status_t pubsub_udpmcAdmin_disconnectEndpointFromReceiver(pubsub_ud
const char *type = celix_properties_get(endpoint, PUBSUB_ENDPOINT_TYPE, NULL);
const char *eScope = celix_properties_get(endpoint, PUBSUB_ENDPOINT_TOPIC_SCOPE, NULL);
const char *eTopic = celix_properties_get(endpoint, PUBSUB_ENDPOINT_TOPIC_NAME, NULL);
- const char *sockAdress = celix_properties_get(endpoint, PUBSUB_PSA_UDPMC_SOCKET_ADDRESS_KEY, NULL);
+ const char *sockAddress = celix_properties_get(endpoint, PUBSUB_PSA_UDPMC_SOCKET_ADDRESS_KEY, NULL);
long sockPort = celix_properties_getAsLong(endpoint, PUBSUB_PSA_UDPMC_SOCKET_PORT_KEY, -1L);
- if (type == NULL || sockAdress == NULL || sockPort < 0) {
+ if (type == NULL || sockAddress == NULL || sockPort < 0) {
fprintf(stderr, "[PSA UPDMC] Error got endpoint without udpmc socket address/port or endpoint type");
status = CELIX_BUNDLE_EXCEPTION;
} else {
@@ -503,7 +503,7 @@ static celix_status_t pubsub_udpmcAdmin_disconnectEndpointFromReceiver(pubsub_ud
strncmp(eScope, scope, 1024 * 1024) == 0 &&
strncmp(eTopic, topic, 1024 * 1024) == 0 &&
strncmp(type, PUBSUB_PUBLISHER_ENDPOINT_TYPE, strlen(PUBSUB_PUBLISHER_ENDPOINT_TYPE)) == 0) {
- pubsub_udpmcTopicReceiver_disconnectFrom(receiver, sockAdress, sockPort);
+ pubsub_udpmcTopicReceiver_disconnectFrom(receiver, sockAddress, sockPort);
}
}
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h
index 02ebd44..cada021 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h
+++ b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h
@@ -25,7 +25,7 @@
#define PUBSUB_UDPMC_ADMIN_TYPE "udp_mc"
#define PUBSUB_PSA_UDPMC_SOCKET_ADDRESS_KEY "udpmc.socket_address"
-#define PUBSUB_PSA_UDPMC_SOCKET_PORT_KEY "udpmc.socker_port"
+#define PUBSUB_PSA_UDPMC_SOCKET_PORT_KEY "udpmc.socket_port"
#define PUBSUB_UDPMC_IP_KEY "PSA_IP"
#define PUBSUB_UDPMC_ITF_KEY "PSA_INTERFACE"
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
index 59c809c..64d7a23 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
+++ b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
@@ -205,7 +205,7 @@ static void* psa_udpmc_getPublisherService(void *handle, const celix_bundle_t *r
entry->service.handle = entry;
entry->service.localMsgTypeIdForMsgType = psa_udpmc_localMsgTypeIdForMsgType;
entry->service.send = psa_udpmc_topicPublicationSend;
- entry->service.sendMultipart = NULL; //note multipart not supported by MCUDP
+ entry->service.sendMultipart = NULL; //note multipart not supported by UDPMC
hashMap_put(sender->boundedServices.map, (void*)bndId, entry);
svc = &entry->service;
} else {
diff --git a/bundles/pubsub/pubsub_api/include/pubsub/publisher.h b/bundles/pubsub/pubsub_api/include/pubsub/publisher.h
index 9f7f3b6..ec91f5c 100644
--- a/bundles/pubsub/pubsub_api/include/pubsub/publisher.h
+++ b/bundles/pubsub/pubsub_api/include/pubsub/publisher.h
@@ -55,7 +55,7 @@ struct pubsub_publisher {
void *handle;
/**
- * Every msg is identifiable by msg type string. Because masg type string are performance wise not preferable (string compares),
+ * Every msg is identifiable by msg type string. Because msg type string are performance wise not preferable (string compares),
* a "local" (int / platform dependent) unique id will be generated runtime
* with use of a distributed key/value store or communication between participation parties.
* this is called the local message type id. This local message type id can be requested with the localMsgIdForMsgType method.
diff --git a/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c b/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c
index de708ff..33165d3 100644
--- a/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c
+++ b/bundles/pubsub/pubsub_discovery/src/pubsub_discovery_impl.c
@@ -397,7 +397,7 @@ celix_status_t pubsub_discovery_announceEndpoint(void *handle, const celix_prope
const char *visibility = celix_properties_get(endpoint, PUBSUB_ENDPOINT_VISIBILITY, PUBSUB_ENDPOINT_VISIBILITY_DEFAULT);
- if (valid && strncmp(visibility, PUBSUB_ENDPOINT_SYSTEM_VISIBLITY, strlen(PUBSUB_ENDPOINT_SYSTEM_VISIBLITY)) == 0) {
+ if (valid && strncmp(visibility, PUBSUB_ENDPOINT_SYSTEM_VISIBILITY, strlen(PUBSUB_ENDPOINT_SYSTEM_VISIBILITY)) == 0) {
pubsub_announce_entry_t *entry = calloc(1, sizeof(*entry));
clock_gettime(CLOCK_MONOTONIC, &entry->createTime);
entry->isSet = false;
@@ -413,7 +413,7 @@ celix_status_t pubsub_discovery_announceEndpoint(void *handle, const celix_prope
celixThreadCondition_broadcast(&disc->waitCond);
celixThreadMutex_unlock(&disc->waitMutex);
} else if (valid) {
- L_DEBUG("[PSD] Ignoring endpoint %s/%s because the visibility is not %s. Configured visibility is %s\n", scope, topic, PUBSUB_ENDPOINT_SYSTEM_VISIBLITY, visibility);
+ L_DEBUG("[PSD] Ignoring endpoint %s/%s because the visibility is not %s. Configured visibility is %s\n", scope, topic, PUBSUB_ENDPOINT_SYSTEM_VISIBILITY, visibility);
}
if (!valid) {
diff --git a/bundles/pubsub/pubsub_spi/include/pubsub_constants.h b/bundles/pubsub/pubsub_spi/include/pubsub_constants.h
index 485391d..ca75248 100644
--- a/bundles/pubsub/pubsub_spi/include/pubsub_constants.h
+++ b/bundles/pubsub/pubsub_spi/include/pubsub_constants.h
@@ -26,16 +26,16 @@
/**
* Endpoints with the system visibility should be discoverable through the complete system
*/
-#define PUBSUB_ENDPOINT_SYSTEM_VISIBLITY "system"
+#define PUBSUB_ENDPOINT_SYSTEM_VISIBILITY "system"
/**
* Endpoints with the system visibility are discoverable for a single host (i.e. IPC)
*/
-#define PUBSUB_ENDPOINT_HOST_VISIBLITY "host"
+#define PUBSUB_ENDPOINT_HOST_VISIBILITY "host"
/**
* Endpoints which are only visible within a single process
*/
-#define PUBSUB_ENDPOINT_LOCAL_VISIBLITY "local"
+#define PUBSUB_ENDPOINT_LOCAL_VISIBILITY "local"
#endif /* PUBSUB_CONSTANTS_H_ */
diff --git a/bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h b/bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h
index 5f0349e..ffbf151 100644
--- a/bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h
+++ b/bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h
@@ -45,7 +45,7 @@ extern "C" {
#define PUBSUB_PUBLISHER_ENDPOINT_TYPE "pubsub.publisher"
#define PUBSUB_SUBSCRIBER_ENDPOINT_TYPE "pubsub.subscriber"
-#define PUBSUB_ENDPOINT_VISIBILITY_DEFAULT PUBSUB_ENDPOINT_SYSTEM_VISIBLITY
+#define PUBSUB_ENDPOINT_VISIBILITY_DEFAULT PUBSUB_ENDPOINT_SYSTEM_VISIBILITY
celix_properties_t *
diff --git a/bundles/pubsub/pubsub_spi/src/pubsub_utils.c b/bundles/pubsub/pubsub_spi/src/pubsub_utils.c
index 225e3c0..2a7f935 100644
--- a/bundles/pubsub/pubsub_spi/src/pubsub_utils.c
+++ b/bundles/pubsub/pubsub_spi/src/pubsub_utils.c
@@ -45,7 +45,7 @@ celix_status_t pubsub_getPubSubInfoFromFilter(const char* filterstr, char **topi
const char *objectClass = NULL;
celix_filter_t *filter = filter_create(filterstr);
if (filter != NULL) {
- if (filter->operand == CELIX_FILTER_OPERAND_AND) { //only and pubsub filter valid (e.g. (&(objectClass=pubsub_publisher)(topic=exmpl))
+ if (filter->operand == CELIX_FILTER_OPERAND_AND) { //only and pubsub filter valid (e.g. (&(objectClass=pubsub_publisher)(topic=example))
array_list_t *attributes = filter->children;
unsigned int i;
unsigned int size = arrayList_size(attributes);
diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
index bfd038b..6c97fa9 100644
--- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
+++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
@@ -449,7 +449,7 @@ celix_status_t pubsub_topologyManager_addDiscoveredEndpoint(void *handle, const
pubsub_topology_manager_t *manager = handle;
const char *uuid = celix_properties_get(endpoint, PUBSUB_ENDPOINT_UUID, NULL);
- assert(uuid != NULL); //discovery should check if endpoint is valid -> pubsubEndoint_isValid.
+ assert(uuid != NULL); //discovery should check if endpoint is valid -> pubsubEndpoint_isValid.
// 1) See if endpoint is already discovered, if so increase usage count.
// 1) If not, find matching psa using the matchEndpoint
diff --git a/bundles/remote_services/README.md b/bundles/remote_services/README.md
index 00a7fc8..4d0f261 100644
--- a/bundles/remote_services/README.md
+++ b/bundles/remote_services/README.md
@@ -91,7 +91,7 @@ See [etcd discovery](discovery_etcd/README.md)
| **Bundle** | `discovery_etcd.zip` |
-Provides a service discovery using etcd distributd key/value store.
+Provides a service discovery using etcd distributed key/value store.
See [etcd discovery](discovery_etcd/README.md)
@@ -110,7 +110,7 @@ The Celix source repository provides a simple calculator example that shows all
1. [The calculator service interface](http://svn.apache.org/repos/asf/celix/trunk/remote_services/calculator_service/public/include/calculator_service.h), providing three methods: one for adding two numbers, one for subtracting two numbers, and lastly, a method that calculates the square root of a number;
2. [A calculator service implementation](http://svn.apache.org/repos/asf/celix/trunk/remote_services/calculator_service/private/src/calculator_impl.c) that simply implements the three previously described functions. To mark this service as "remote service", you need to add the `service.exported.interfaces` service property to its service registration. This way, the RSA implementation can expose it as remote service to others;
3. [A service endpoint](http://svn.apache.org/repos/asf/celix/trunk/remote_services/calculator_endpoint/private/src/calculator_endpoint_impl.c), which is called by the RSA implementation to delegate a method invocation to an actual method in the service implementation. The service endpoint should be registered as `remote_endpoint` service, along with the `remote.interface` service property denoting which service interface this endpoint is capable of handling;
-4. [A service proxy (factory)](http://svn.apache.org/repos/asf/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c), called by the service client when it wants to invoke a method on a remoted service. The service proxy should be registered as `remote_proxy_factory` service along with the `proxy.interface` service property denoting which service interface the service proxy is capable of handling;
+4. [A service proxy (factory)](http://svn.apache.org/repos/asf/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c), called by the service client when it wants to invoke a method on a remote service. The service proxy should be registered as `remote_proxy_factory` service along with the `proxy.interface` service property denoting which service interface the service proxy is capable of handling;
5. [A service client](http://svn.apache.org/repos/asf/celix/trunk/remote_services/calculator_shell/private/src/add_command.c), that exposes the three calculator methods to as Celix shell commands. The implementation simply retrieves the calculator service as it would do with any other Celix service.
If you have access to the Celix source repository, you can run the calculator example using various discovery implementations by invoking the `deploy` target. You can find the example deployments in the `CELIX_BUILD/deploy` directory. For example, to run the calculator example using the configured discovery mechanism, you should open two terminals. In the first terminal, type:
diff --git a/bundles/remote_services/discovery_common/include/discovery.h b/bundles/remote_services/discovery_common/include/discovery.h
index ede3d5e..4c8e9c5 100644
--- a/bundles/remote_services/discovery_common/include/discovery.h
+++ b/bundles/remote_services/discovery_common/include/discovery.h
@@ -71,8 +71,8 @@ celix_status_t discovery_destroy(discovery_pt discovery);
celix_status_t discovery_start(discovery_pt discovery);
celix_status_t discovery_stop(discovery_pt discovery);
-celix_status_t discovery_endpointAdded(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
-celix_status_t discovery_endpointRemoved(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
+celix_status_t discovery_endpointAdded(void *handle, endpoint_description_pt endpoint, char *matchedFilter);
+celix_status_t discovery_endpointRemoved(void *handle, endpoint_description_pt endpoint, char *matchedFilter);
celix_status_t discovery_endpointListenerAdding(void * handle, service_reference_pt reference, void **service);
celix_status_t discovery_endpointListenerAdded(void * handle, service_reference_pt reference, void * service);
diff --git a/bundles/remote_services/discovery_common/src/endpoint_discovery_server.c b/bundles/remote_services/discovery_common/src/endpoint_discovery_server.c
index 7620bbf..ce23179 100644
--- a/bundles/remote_services/discovery_common/src/endpoint_discovery_server.c
+++ b/bundles/remote_services/discovery_common/src/endpoint_discovery_server.c
@@ -67,7 +67,7 @@ static int endpointDiscoveryServer_callback(struct mg_connection *conn);
static char* format_path(const char* path);
#ifndef ANDROID
-static celix_status_t endpointDiscoveryServer_getIpAdress(char* interface, char** ip);
+static celix_status_t endpointDiscoveryServer_getIpAddress(char* interface, char** ip);
#endif
celix_status_t endpointDiscoveryServer_create(
@@ -109,12 +109,12 @@ celix_status_t endpointDiscoveryServer_create(
const char *interface = NULL;
bundleContext_getProperty(context, DISCOVERY_SERVER_INTERFACE, &interface);
- if ((interface != NULL) && (endpointDiscoveryServer_getIpAdress((char*)interface, &detectedIp) != CELIX_SUCCESS)) {
- logHelper_log(*(*server)->loghelper, OSGI_LOGSERVICE_WARNING, "Could not retrieve IP adress for interface %s", interface);
+ if ((interface != NULL) && (endpointDiscoveryServer_getIpAddress((char*)interface, &detectedIp) != CELIX_SUCCESS)) {
+ logHelper_log(*(*server)->loghelper, OSGI_LOGSERVICE_WARNING, "Could not retrieve IP address for interface %s", interface);
}
if (detectedIp == NULL) {
- endpointDiscoveryServer_getIpAdress(NULL, &detectedIp);
+ endpointDiscoveryServer_getIpAddress(NULL, &detectedIp);
}
ip = detectedIp;
@@ -277,7 +277,7 @@ celix_status_t endpointDiscoveryServer_removeEndpoint(endpoint_discovery_server_
hashMap_remove(server->entries, key);
- // we've made this key, see _addEnpoint above...
+ // we've made this key, see _addEndpoint above...
free((void*) key);
}
@@ -421,7 +421,7 @@ static int endpointDiscoveryServer_callback(struct mg_connection* conn) {
}
#ifndef ANDROID
-static celix_status_t endpointDiscoveryServer_getIpAdress(char* interface, char** ip) {
+static celix_status_t endpointDiscoveryServer_getIpAddress(char* interface, char** ip) {
celix_status_t status = CELIX_BUNDLE_EXCEPTION;
struct ifaddrs *ifaddr, *ifa;
diff --git a/bundles/remote_services/discovery_shm/src/discovery_shm.c b/bundles/remote_services/discovery_shm/src/discovery_shm.c
index 1b1170e..89569dc 100644
--- a/bundles/remote_services/discovery_shm/src/discovery_shm.c
+++ b/bundles/remote_services/discovery_shm/src/discovery_shm.c
@@ -65,7 +65,7 @@ struct shmData {
celix_thread_mutex_t globalLock;
};
-void* shmAdress;
+void* shmAddress;
static celix_status_t discoveryShm_removeWithIndex(shmData_pt data, int index);
@@ -85,7 +85,7 @@ celix_status_t discoveryShm_create(shmData_pt* data) {
status = CELIX_ENOMEM;
} else if ((shmData->shmId = shmget(shmKey, DISCOVERY_SHM_MEMSIZE, IPC_CREAT | 0666)) < 0) {
status = CELIX_BUNDLE_EXCEPTION;
- } else if ((shmAdress = shmat(shmData->shmId, 0, 0)) == (char*) -1) {
+ } else if ((shmAddress = shmat(shmData->shmId, 0, 0)) == (char*) -1) {
status = CELIX_BUNDLE_EXCEPTION;
} else {
celix_thread_mutexattr_t threadAttr;
@@ -106,8 +106,8 @@ celix_status_t discoveryShm_create(shmData_pt* data) {
}
if (status == CELIX_SUCCESS) {
- memcpy(shmAdress, shmData, sizeof(struct shmData));
- (*data) = shmAdress;
+ memcpy(shmAddress, shmData, sizeof(struct shmData));
+ (*data) = shmAddress;
}
}
@@ -265,7 +265,7 @@ celix_status_t discoveryShm_detach(shmData_pt data) {
if (data->numOfEntries == 0) {
status = discoveryShm_destroy(data);
}
- else if (shmdt(shmAdress) == 0) {
+ else if (shmdt(shmAddress) == 0) {
status = CELIX_SUCCESS;
}
diff --git a/bundles/remote_services/examples/calculator_service/src/calculator_impl.h b/bundles/remote_services/examples/calculator_service/src/calculator_impl.h
index 5e075e4..6967ec4 100644
--- a/bundles/remote_services/examples/calculator_service/src/calculator_impl.h
+++ b/bundles/remote_services/examples/calculator_service/src/calculator_impl.h
@@ -34,10 +34,10 @@
struct calculator {
};
-celix_status_t calculator_create(calculator_pt *calcuator);
-celix_status_t calculator_destroy(calculator_pt *calcuator);
-celix_status_t calculator_add(calculator_pt calcuator, double a, double b, double *result);
-celix_status_t calculator_sub(calculator_pt calcuator, double a, double b, double *result);
-celix_status_t calculator_sqrt(calculator_pt calcuator, double a, double *result);
+celix_status_t calculator_create(calculator_pt *calculator);
+celix_status_t calculator_destroy(calculator_pt *calculator);
+celix_status_t calculator_add(calculator_pt calculator, double a, double b, double *result);
+celix_status_t calculator_sub(calculator_pt calculator, double a, double b, double *result);
+celix_status_t calculator_sqrt(calculator_pt calculator, double a, double *result);
#endif /* CALCULATOR_IMPL_H_ */
diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c
index 6effc94..147aa54 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c
+++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.c
@@ -109,7 +109,7 @@ static const unsigned int DEFAULT_TIMEOUT = 0;
static int remoteServiceAdmin_callback(struct mg_connection *conn);
static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, service_reference_pt reference, properties_pt props, char *interface, endpoint_description_pt *description);
static celix_status_t remoteServiceAdmin_send(void *handle, endpoint_description_pt endpointDescription, char *request, char **reply, int* replyStatus);
-static celix_status_t remoteServiceAdmin_getIpAdress(char* interface, char** ip);
+static celix_status_t remoteServiceAdmin_getIpAddress(char* interface, char** ip);
static size_t remoteServiceAdmin_readCallback(void *ptr, size_t size, size_t nmemb, void *userp);
static size_t remoteServiceAdmin_write(void *contents, size_t size, size_t nmemb, void *userp);
static void remoteServiceAdmin_log(remote_service_admin_pt admin, int level, const char *file, int line, const char *msg, ...);
@@ -153,12 +153,12 @@ celix_status_t remoteServiceAdmin_create(bundle_context_pt context, remote_servi
const char *interface = NULL;
bundleContext_getProperty(context, "RSA_INTERFACE", &interface);
- if ((interface != NULL) && (remoteServiceAdmin_getIpAdress((char*)interface, &detectedIp) != CELIX_SUCCESS)) {
- logHelper_log((*admin)->loghelper, OSGI_LOGSERVICE_WARNING, "RSA: Could not retrieve IP adress for interface %s", interface);
+ if ((interface != NULL) && (remoteServiceAdmin_getIpAddress((char*)interface, &detectedIp) != CELIX_SUCCESS)) {
+ logHelper_log((*admin)->loghelper, OSGI_LOGSERVICE_WARNING, "RSA: Could not retrieve IP address for interface %s", interface);
}
if (ip == NULL) {
- remoteServiceAdmin_getIpAdress(NULL, &detectedIp);
+ remoteServiceAdmin_getIpAddress(NULL, &detectedIp);
}
ip = detectedIp;
@@ -555,7 +555,7 @@ static celix_status_t remoteServiceAdmin_createEndpointDescription(remote_servic
return status;
}
-static celix_status_t remoteServiceAdmin_getIpAdress(char* interface, char** ip) {
+static celix_status_t remoteServiceAdmin_getIpAddress(char* interface, char** ip) {
celix_status_t status = CELIX_BUNDLE_EXCEPTION;
struct ifaddrs *ifaddr, *ifa;
diff --git a/bundles/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h b/bundles/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
index 1f88e8f..3e9772d 100644
--- a/bundles/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
+++ b/bundles/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
@@ -62,7 +62,7 @@ struct recv_shm_thread {
struct ipc_segment {
int semId;
int shmId;
- void *shmBaseAdress;
+ void *shmBaseAddress;
};
struct remote_service_admin {
diff --git a/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c b/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
index f090223..018d337 100644
--- a/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
+++ b/bundles/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
@@ -266,7 +266,7 @@ celix_status_t remoteServiceAdmin_send(remote_service_admin_pt admin, endpoint_d
remoteServiceAdmin_lock(semid, 0);
/* write method and data */
- strcpy(ipc->shmBaseAdress, request);
+ strcpy(ipc->shmBaseAddress, request);
/* Check the status of the send-receive semaphore and reset them if not correct */
if (remoteServiceAdmin_getCount(ipc->semId, 1) > 0) {
@@ -283,7 +283,7 @@ celix_status_t remoteServiceAdmin_send(remote_service_admin_pt admin, endpoint_d
remoteServiceAdmin_lock(semid, 2);
/* read reply */
- *reply = strdup(ipc->shmBaseAdress);
+ *reply = strdup(ipc->shmBaseAddress);
/* TODO: fix replyStatus */
*replyStatus = 0;
@@ -314,7 +314,7 @@ static void * remoteServiceAdmin_receiveFromSharedMemory(void *data) {
// TODO: align data size
char *data = calloc(1024, sizeof(*data));
- strcpy(data, ipc->shmBaseAdress);
+ strcpy(data, ipc->shmBaseAddress);
hash_map_iterator_pt iter = hashMapIterator_create(admin->exportedServices);
@@ -336,7 +336,7 @@ static void * remoteServiceAdmin_receiveFromSharedMemory(void *data) {
if ((strlen(reply) * sizeof(char)) >= RSA_SHM_MEMSIZE) {
logHelper_log(admin->loghelper, OSGI_LOGSERVICE_ERROR, "receiveFromSharedMemory : size of message bigger than shared memory message. NOT SENDING.");
} else {
- strcpy(ipc->shmBaseAdress, reply);
+ strcpy(ipc->shmBaseAddress, reply);
}
free(reply);
}
@@ -633,7 +633,7 @@ celix_status_t remoteServiceAdmin_getIpcSegment(remote_service_admin_pt admin, e
}
celix_status_t remoteServiceAdmin_detachIpcSegment(ipc_segment_pt ipc) {
- return (shmdt(ipc->shmBaseAdress) != -1) ? CELIX_SUCCESS : CELIX_BUNDLE_EXCEPTION;
+ return (shmdt(ipc->shmBaseAddress) != -1) ? CELIX_SUCCESS : CELIX_BUNDLE_EXCEPTION;
}
celix_status_t remoteServiceAdmin_deleteIpcSegment(ipc_segment_pt ipc) {
@@ -680,18 +680,18 @@ celix_status_t remoteServiceAdmin_createOrAttachShm(hash_map_pt ipcSegment, remo
if ((ipc->shmId = shmget(shmKey, RSA_SHM_MEMSIZE, IPC_CREAT | 0666)) < 0) {
logHelper_log(admin->loghelper, OSGI_LOGSERVICE_ERROR, "Creation of shared memory segment failed.");
status = CELIX_BUNDLE_EXCEPTION;
- } else if ((ipc->shmBaseAdress = shmat(ipc->shmId, 0, 0)) == (char *) -1) {
+ } else if ((ipc->shmBaseAddress = shmat(ipc->shmId, 0, 0)) == (char *) -1) {
logHelper_log(admin->loghelper, OSGI_LOGSERVICE_ERROR, "Attaching of shared memory segment failed.");
status = CELIX_BUNDLE_EXCEPTION;
} else {
- logHelper_log(admin->loghelper, OSGI_LOGSERVICE_INFO, "shared memory segment sucessfully created at %p.", ipc->shmBaseAdress);
+ logHelper_log(admin->loghelper, OSGI_LOGSERVICE_INFO, "shared memory segment successfully created at %p.", ipc->shmBaseAddress);
}
}
- } else if ((ipc->shmBaseAdress = shmat(ipc->shmId, 0, 0)) == (char *) -1) {
+ } else if ((ipc->shmBaseAddress = shmat(ipc->shmId, 0, 0)) == (char *) -1) {
logHelper_log(admin->loghelper, OSGI_LOGSERVICE_ERROR, "Attaching to shared memory segment failed.");
status = CELIX_BUNDLE_EXCEPTION;
} else {
- logHelper_log(admin->loghelper, OSGI_LOGSERVICE_INFO, "sucessfully attached to shared memory at %p.", ipc->shmBaseAdress);
+ logHelper_log(admin->loghelper, OSGI_LOGSERVICE_INFO, "successfully attached to shared memory at %p.", ipc->shmBaseAddress);
}
}
diff --git a/bundles/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp b/bundles/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
index 13c6941..4902574 100644
--- a/bundles/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
+++ b/bundles/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
@@ -485,12 +485,12 @@ TEST(RsaShmClientServerTests, TestExport) {
/*
TEST(RsaShmClientServerTests, TestProxyRemoval) {
- // test is currenlty failing
+ // test is currently failing
// testProxyRemoval();
}
TEST(RsaShmClientServerTests, TestEndpointRemoval) {
- // test is currenlty failing
+ // test is currently failing
//testEndpointRemoval();
}
*/
diff --git a/bundles/remote_services/remote_services_api/README.md b/bundles/remote_services/remote_services_api/README.md
index 2e3d268..38b149f 100644
--- a/bundles/remote_services/remote_services_api/README.md
+++ b/bundles/remote_services/remote_services_api/README.md
@@ -2,7 +2,7 @@
The Remote Service Admin (RSA) provides the mechanisms to import and export services when instructed to do so by the Topology Manager.
-To delegate method calls to the actual service implementation, the RSA_SHM and the RSA_HTTP are using "endpoint/proxy" bundles, which has all the knowledge about the marshalling and unmarshalling of data for the service. The RSA_DFI implementation combines a [foreign function interface](https://en.wikipedia.org/wiki/Foreign_function_interface) technique together with manualy created descriptors.
+To delegate method calls to the actual service implementation, the RSA_SHM and the RSA_HTTP are using "endpoint/proxy" bundles, which has all the knowledge about the marshalling and unmarshalling of data for the service. The RSA_DFI implementation combines a [foreign function interface](https://en.wikipedia.org/wiki/Foreign_function_interface) technique together with manually created descriptors.
Note that this folder contains code commonly used by the RSA implementations and therefore does not include any CMAKE configuration.
diff --git a/bundles/remote_services/rsa_spi/README.md b/bundles/remote_services/rsa_spi/README.md
index 2e3d268..38b149f 100644
--- a/bundles/remote_services/rsa_spi/README.md
+++ b/bundles/remote_services/rsa_spi/README.md
@@ -2,7 +2,7 @@
The Remote Service Admin (RSA) provides the mechanisms to import and export services when instructed to do so by the Topology Manager.
-To delegate method calls to the actual service implementation, the RSA_SHM and the RSA_HTTP are using "endpoint/proxy" bundles, which has all the knowledge about the marshalling and unmarshalling of data for the service. The RSA_DFI implementation combines a [foreign function interface](https://en.wikipedia.org/wiki/Foreign_function_interface) technique together with manualy created descriptors.
+To delegate method calls to the actual service implementation, the RSA_SHM and the RSA_HTTP are using "endpoint/proxy" bundles, which has all the knowledge about the marshalling and unmarshalling of data for the service. The RSA_DFI implementation combines a [foreign function interface](https://en.wikipedia.org/wiki/Foreign_function_interface) technique together with manually created descriptors.
Note that this folder contains code commonly used by the RSA implementations and therefore does not include any CMAKE configuration.
diff --git a/bundles/remote_services/rsa_spi/include/endpoint_listener.h b/bundles/remote_services/rsa_spi/include/endpoint_listener.h
index 2e6359f..9e76578 100644
--- a/bundles/remote_services/rsa_spi/include/endpoint_listener.h
+++ b/bundles/remote_services/rsa_spi/include/endpoint_listener.h
@@ -38,8 +38,8 @@ static const char * const OSGI_ENDPOINT_LISTENER_SCOPE = "endpoint.listener.scop
struct endpoint_listener {
void *handle;
- celix_status_t (*endpointAdded)(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
- celix_status_t (*endpointRemoved)(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
+ celix_status_t (*endpointAdded)(void *handle, endpoint_description_pt endpoint, char *matchedFilter);
+ celix_status_t (*endpointRemoved)(void *handle, endpoint_description_pt endpoint, char *matchedFilter);
};
typedef struct endpoint_listener endpoint_listener_t;
diff --git a/bundles/remote_services/topology_manager/src/scope.c b/bundles/remote_services/topology_manager/src/scope.c
index 3b5bffa..c6f2c27 100644
--- a/bundles/remote_services/topology_manager/src/scope.c
+++ b/bundles/remote_services/topology_manager/src/scope.c
@@ -119,7 +119,7 @@ celix_status_t tm_addImportScope(void *handle, char *filter) {
return CELIX_ILLEGAL_ARGUMENT;
new = filter_create(filter);
if (new == NULL) {
- return CELIX_ILLEGAL_ARGUMENT; // filter not parseble
+ return CELIX_ILLEGAL_ARGUMENT; // filter not parsable
}
if (celixThreadMutex_lock(&scope->importScopeLock) == CELIX_SUCCESS) {
int index = arrayList_indexOf(scope->importScopes, new);
@@ -149,7 +149,7 @@ celix_status_t tm_removeImportScope(void *handle, char *filter) {
new = filter_create(filter);
if (new == NULL) {
- return CELIX_ILLEGAL_ARGUMENT; // filter not parseble
+ return CELIX_ILLEGAL_ARGUMENT; // filter not parsable
}
if (celixThreadMutex_lock(&scope->importScopeLock) == CELIX_SUCCESS) {
diff --git a/bundles/shell/remote_shell/src/remote_shell.c b/bundles/shell/remote_shell/src/remote_shell.c
index 8f42778..fc9b702 100644
--- a/bundles/shell/remote_shell/src/remote_shell.c
+++ b/bundles/shell/remote_shell/src/remote_shell.c
@@ -40,7 +40,7 @@
#define RS_PROMPT ("-> ")
#define RS_WELCOME ("\n---- Apache Celix Remote Shell ----\n---- Type exit to disconnect ----\n\n-> ")
-#define RS_GOODBYE ("Goobye!\n")
+#define RS_GOODBYE ("Goodbye!\n")
#define RS_ERROR ("Error executing command!\n")
#define RS_MAXIMUM_CONNECTIONS_REACHED ("Maximum number of connections reached. Disconnecting ...\n")
diff --git a/bundles/shell/shell/include/command.h b/bundles/shell/shell/include/command.h
index 65e4306..4cac7bc 100644
--- a/bundles/shell/shell/include/command.h
+++ b/bundles/shell/shell/include/command.h
@@ -44,8 +44,8 @@ typedef command_service_t * command_service_pt;
* The command service can be used to register additional shell commands.
* The service should be register with the following properties:
* - command.name: mandatory, name of the command e.g. 'lb'
- * - command.usage: optional, string describing how tu use the commmand e.g. 'lb [-l | -s | -u]'
- * - command.descrription: optional, string describing the command e.g. 'list bundles.'
+ * - command.usage: optional, string describing how tu use the command e.g. 'lb [-l | -s | -u]'
+ * - command.description: optional, string describing the command e.g. 'list bundles.'
*/
struct commandService {
void *handle;
diff --git a/bundles/shell/shell/src/activator.c b/bundles/shell/shell/src/activator.c
index 6cfe9c3..bf71e47 100644
--- a/bundles/shell/shell/src/activator.c
+++ b/bundles/shell/shell/src/activator.c
@@ -144,7 +144,7 @@ celix_status_t bundleActivator_create(bundle_context_pt context_ptr, void **_ppt
(struct command) {
.exec = dmListCommand_execute,
.name = "dm",
- .description = "Gives an overview of the component managemed by a dependency manager.",
+ .description = "Gives an overview of the component managed by a dependency manager.",
.usage = "dm [f|full] [<Bundle ID> [<Bundle ID> [...]]]"
};
instance_ptr->std_commands[10] =
diff --git a/bundles/shell/shell/src/help_command.c b/bundles/shell/shell/src/help_command.c
index 48615ae..aa9334e 100644
--- a/bundles/shell/shell/src/help_command.c
+++ b/bundles/shell/shell/src/help_command.c
@@ -93,7 +93,7 @@ celix_status_t helpCommand_execute(void *_ptr, char *line_str, FILE *out_ptr, FI
fprintf(out_ptr, "Usage : %s\n", usage_str == NULL ? "" : usage_str);
fprintf(out_ptr, "Description : %s\n", desc_str == NULL ? "" : desc_str);
} else {
- fprintf(err_ptr, "Error retreiving help info for command '%s'\n", sub);
+ fprintf(err_ptr, "Error retrieving help info for command '%s'\n", sub);
}
if (sub_status_desc != CELIX_SUCCESS && status == CELIX_SUCCESS) {
diff --git a/bundles/shell/shell_tui/README.md b/bundles/shell/shell_tui/README.md
index 2b8984f..130fb6e 100644
--- a/bundles/shell/shell_tui/README.md
+++ b/bundles/shell/shell_tui/README.md
@@ -24,7 +24,7 @@ The Celix Shell TUI implements a textual user interface for the Celix Shell.
## Config options
-- SHELL_USE_ANSI_CONTROL_SEQUENCES - Wether to use ANSI control
+- SHELL_USE_ANSI_CONTROL_SEQUENCES - Whether to use ANSI control
sequences to support backspace, left, up, etc key commands in the
shell tui. Default is true if a TERM environment is set else false.
diff --git a/documents/building/README.md b/documents/building/README.md
index 2bfeecb..5062088 100644
--- a/documents/building/README.md
+++ b/documents/building/README.md
@@ -128,7 +128,7 @@ sudo make install
## Running Apache Celix
-If Apache Celix is succesfully installed running
+If Apache Celix is successfully installed running
```bash
celix
```
diff --git a/documents/cmake_commands/README.md b/documents/cmake_commands/README.md
index 4995e35..6705e3b 100644
--- a/documents/cmake_commands/README.md
+++ b/documents/cmake_commands/README.md
@@ -71,7 +71,7 @@ add_celix_bundle(<bundle_target_name>
- If NAME is provided that will be used as Bundle-Name. Default the bundle target name is used as symbolic name.
- If SYMBOLIC_NAME is provided that will be used as Bundle-SymbolicName. Default the bundle target name is used as symbolic name.
- If DESCRIPTION is provided that will be used as Bundle-Description. Default this is empty
-- If VERSION is provided. That will be used for the Bundle-Version. In combination with SOURCES the version will alse be use to set the activator library target property VERSION and SOVERSION.
+- If VERSION is provided. That will be used for the Bundle-Version. In combination with SOURCES the version will also be used to set the activator library target property VERSION and SOVERSION.
For SOVERSION only the major part is used. Expected scheme is "<major>.<minor>.<path>". Default version is "0.0.0"
- If PRIVATE_LIBRARIES is provided all provided lib are added to the "Private-Library" manifest statement and added in the root of the bundle. libraries can be cmake library targets or absolute paths to existing libraries.
- If EXPORT_LIBRARIES is provided all provided lib are added to the "Export-Library" manifest statement and added in the root of the bundle. libraries can be cmake library targets or absolute paths to existing libraries. This is not yet supported by the celix framework.
@@ -212,7 +212,7 @@ celix_container_bundles(<celix_container_target_name>
- If the LEVEL is provided this will be used as the bundle run level.
If no run level is provided run level 1 is used.
Run levels can be used to control to start order of the bundles.
- Bundles in run level 0 arre started first and bundles in run level 5
+ Bundles in run level 0 are started first and bundles in run level 5
are started last.
## celix_container_properties
@@ -227,7 +227,7 @@ celix_container_properties(<celix_container_target_name>
)
```
-## celix_cotainer_embedded_properties
+## celix_container_embedded_properties
Embeds the provided properties to the target Celix launcher as embedded properties.
Note that these properties can be overridden by using config.properties.
diff --git a/documents/subprojects/README.md b/documents/subprojects/README.md
index e6fa09a..07d1229 100644
--- a/documents/subprojects/README.md
+++ b/documents/subprojects/README.md
@@ -25,7 +25,7 @@ Apache Celix is organized into several subprojects. The following subproject are
* [Device Access](../../bundles/device_access/README.md) - An implementation of the OSGi Device Access specification adapted to C.
* [Etcd library](../../libs/etcdlib/README.md) - A C library that interfaces with ETCD.
* [Examples](../../examples) - A Selection of examples showing how the framework can be used.
-* [Log Service](../../bundles/log_service/README.md) - An implementation of the OSGi Log Service adapated to C.
+* [Log Service](../../bundles/log_service/README.md) - An implementation of the OSGi Log Service adapted to C.
* [Log Writer](../../bundles/log_writer/README.md) - A simple log writer for use in combination with the Log Service.
* [Remote Service Admin](../../bundles/remote_services/README.md) - An implementation of the OSGi Remote Service Admin Service - for several protocols - adapted to C.
* [Shell](../../bundles/shell/shell/README.md) - A OSGi shell implementation.
diff --git a/examples/celix-examples/services_example_c/README.md b/examples/celix-examples/services_example_c/README.md
index 14c21b0..98d9fb4 100644
--- a/examples/celix-examples/services_example_c/README.md
+++ b/examples/celix-examples/services_example_c/README.md
@@ -43,7 +43,7 @@ The simple provider/consumer example can be executed by launching the
(build in `${CMAKE_BUILD_DIR}/deploy/services_example/services_example_c`)
In this example the provide bundle only register one calc service. And
-the consumer bundle tries to use this during startup and registerd
+the consumer bundle tries to use this during startup and registered
a service tracker for the calc service.
Try stopping/starting the provider / consumer bundles (respectively bundle id 3 & 4)
@@ -59,7 +59,7 @@ The dynamic provider/consumer example can be executed by launching the
The dynamic service provide / consumer example show how the framework copes
with the dynamic behaviour of services.
-This this example the provided dynammically register more and less calc services in a thread.
+This this example the provided dynamically register more and less calc services in a thread.
The consumer bundle uses these services in a every 5 seconds and print some info.
Hopefully this example will give an idea how services can be safely used and tracked in a dynamic environment.
diff --git a/libs/dependency_manager/README.md b/libs/dependency_manager/README.md
index 2fdc0fb..a1a83ad 100644
--- a/libs/dependency_manager/README.md
+++ b/libs/dependency_manager/README.md
@@ -48,7 +48,7 @@ The Dependency Manager consist out of four main parts: `DM (Dependency Manager)
### DM Activator
-The `DM Activator` implements a "normal" Celix bundle activator and depends on four functions which needs to be implemented by the user of the Depedency Manager:
+The `DM Activator` implements a "normal" Celix bundle activator and depends on four functions which needs to be implemented by the user of the Dependency Manager:
- `dm_create` : Should be used to allocated and initialize a dm activator structure. If needed this structure can be used to store object during the lifecycle of the bundle.
- `dm_init` : Should be used to interact with the `Dependency Manager`. Here a user can components, service dependencies and provided services.
- `dm_destroy` : Should be used to deinitialize and deallocate objects created in the `dm_create` function.
@@ -56,7 +56,7 @@ The `DM Activator` implements a "normal" Celix bundle activator and depends on f
### Dependency Manager
-The `Dependency Manager` act as an entry point to add or remove DM Components. The `Dependency Manager` is provided to the `dm_init` functoin.
+The `Dependency Manager` act as an entry point to add or remove DM Components. The `Dependency Manager` is provided to the `dm_init` function.
### DM Component
diff --git a/libs/dependency_manager/TODO.md b/libs/dependency_manager/TODO.md
index d424aef..0b67274 100644
--- a/libs/dependency_manager/TODO.md
+++ b/libs/dependency_manager/TODO.md
@@ -2,6 +2,6 @@
- Move documentation
- Move dummy targets
-- Depecrate the Celix::dm_shell, Celix::dependency_manager_static
+- Deprecate the Celix::dm_shell, Celix::dependency_manager_static
and Celix::dependency_manager_so targets. (how?)
- Eventually remove the deprecated dm targets
diff --git a/libs/dependency_manager/api/dm_activator.h b/libs/dependency_manager/api/dm_activator.h
index ffbf6b2..e8d0861 100644
--- a/libs/dependency_manager/api/dm_activator.h
+++ b/libs/dependency_manager/api/dm_activator.h
@@ -51,7 +51,7 @@ celix_status_t dm_init(void * userData, celix_bundle_context_t *ctx, dm_dependen
/**
* Should be implemented by a bundle specific DM activator.
- * Should deinitialize and deallocate the undle specific activator struct.
+ * Should deinitialize and deallocate the bundle specific activator struct.
*/
celix_status_t dm_destroy(void * userData, celix_bundle_context_t *ctx, dm_dependency_manager_t *mng);
diff --git a/libs/dependency_manager_cxx/TODO.md b/libs/dependency_manager_cxx/TODO.md
index e7a8134..0bd8a24 100644
--- a/libs/dependency_manager_cxx/TODO.md
+++ b/libs/dependency_manager_cxx/TODO.md
@@ -2,8 +2,8 @@
- Move documentation
- Move dummy targets
-- Depecrate the Celix::dependency_manager_cxx_static target. (how?)
+- Deprecate the Celix::dependency_manager_cxx_static target. (how?)
- Eventually remove the deprecated cxx dm target
- The bundle activator is now still a small .cc file, still resulting in
-a static libary which has to be linked as whole. Make this a src dependency? or some how a
+a static library which has to be linked as whole. Make this a src dependency? or some how a
header impl ?
\ No newline at end of file
diff --git a/libs/dfi/include/dyn_function.h b/libs/dfi/include/dyn_function.h
index 7f5cd57..a73c941 100644
--- a/libs/dfi/include/dyn_function.h
+++ b/libs/dfi/include/dyn_function.h
@@ -26,9 +26,9 @@
* Uses the following schema
* (Name)([Type]*)Type
*
- * Dyn fynction argument meta (am) as meta info, with the following possible values
+ * Dyn function argument meta (am) as meta info, with the following possible values
* am=handle #void pointer for the handle
- * am=pre #output pointer with memory preallocated
+ * am=pre #output pointer with memory pre-allocated
* am=out #output pointer
*/
diff --git a/libs/dfi/src/dyn_function.c b/libs/dfi/src/dyn_function.c
index 615ad16..db718f2 100644
--- a/libs/dfi/src/dyn_function.c
+++ b/libs/dfi/src/dyn_function.c
@@ -80,7 +80,7 @@ int dynFunction_parse(FILE *descriptor, struct types_head *refTypes, dyn_functio
}
}
} else {
- LOG_ERROR("Error allocationg memory for dyn functipn\n");
+ LOG_ERROR("Error allocating memory for dyn function\n");
status = MEM_ERROR;
}
diff --git a/libs/dfi/src/dyn_interface.c b/libs/dfi/src/dyn_interface.c
index 63aafac..abb5345 100644
--- a/libs/dfi/src/dyn_interface.c
+++ b/libs/dfi/src/dyn_interface.c
@@ -336,7 +336,7 @@ static int dynInterface_parseMethods(dyn_interface_type *intf, FILE *stream) {
}
if (func != NULL) {
dynFunction_destroy(func);
- //TODO free strIdentier, name
+ //TODO free strIdentifier, name
}
break;
}
diff --git a/libs/dfi/test/dyn_closure_tests.cpp b/libs/dfi/test/dyn_closure_tests.cpp
index 9c1abe6..eb98562 100644
--- a/libs/dfi/test/dyn_closure_tests.cpp
+++ b/libs/dfi/test/dyn_closure_tests.cpp
@@ -156,7 +156,7 @@ TEST_GROUP(DynClosureTests) {
}
};
-TEST(DynClosureTests, DynCLosureTest1) {
+TEST(DynClosureTests, DynClosureTest1) {
//TODO split up
tests();
}
diff --git a/libs/etcdlib/README.md b/libs/etcdlib/README.md
index 28cc442..2670153 100644
--- a/libs/etcdlib/README.md
+++ b/libs/etcdlib/README.md
@@ -20,7 +20,7 @@ etcd is a distributed, consistent key-value store for shared configuration and s
This repository provides a library for etcd for C applications.
-Etcdlib can be used as part of Celix but is also useable stand-alone.
+Etcdlib can be used as part of Celix but is also usable stand-alone.
## Preparing
The following packages (libraries + headers) should be installed on your system:
diff --git a/libs/etcdlib/src/etcd.c b/libs/etcdlib/src/etcd.c
index 7db128e..bf62e55 100644
--- a/libs/etcdlib/src/etcd.c
+++ b/libs/etcdlib/src/etcd.c
@@ -40,7 +40,7 @@
#define MAX_OVERHEAD_LENGTH 64
#define DEFAULT_CURL_TIMEOUT 10
-#define DEFAULT_CURL_CONECTTIMEOUT 10
+#define DEFAULT_CURL_CONNECT_TIMEOUT 10
typedef enum {
GET, PUT, DELETE
@@ -241,7 +241,7 @@ int etcd_get_directory(const char* directory, etcd_key_value_callback callback,
*modifiedIndex = indexFromHeader;
}
} else {
- // Error occured, retrieve the index of ETCD from the error code
+ // Error occurred, retrieve the index of ETCD from the error code
js_rootnode = json_object_get(js_root, ETCD_JSON_INDEX);
if(js_rootnode) {
json_int_t index = json_integer_value(js_rootnode);
@@ -586,7 +586,7 @@ static int performRequest(char* url, request_t request, void* reqData, void* rep
curl = curl_easy_init();
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, DEFAULT_CURL_TIMEOUT);
- curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, DEFAULT_CURL_CONECTTIMEOUT);
+ curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, DEFAULT_CURL_CONNECT_TIMEOUT);
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
diff --git a/libs/framework/include/celix/dm/Component.h b/libs/framework/include/celix/dm/Component.h
index d5df319..b2874d4 100644
--- a/libs/framework/include/celix/dm/Component.h
+++ b/libs/framework/include/celix/dm/Component.h
@@ -93,7 +93,7 @@ namespace celix { namespace dm {
static Component<T>* create(celix_bundle_context_t*);
/**
- * Wether the component is valid. Invalid component can occurs when no new components can be created and
+ * Whether the component is valid. Invalid component can occurs when no new components can be created and
* exceptions are not allowed.
* @return
*/
diff --git a/libs/framework/include/celix/dm/ServiceDependency.h b/libs/framework/include/celix/dm/ServiceDependency.h
index 59d43f0..696e513 100644
--- a/libs/framework/include/celix/dm/ServiceDependency.h
+++ b/libs/framework/include/celix/dm/ServiceDependency.h
@@ -54,7 +54,7 @@ namespace celix { namespace dm {
} else if (strategy == DependencyUpdateStrategy::suspend) {
celix_dmServiceDependency_setStrategy(this->cServiceDependency(), DM_SERVICE_DEPENDENCY_STRATEGY_SUSPEND);
} else {
- std::cerr << "Unexpected dependency update strategy. Cannot convert for dm_depdendency\n";
+ std::cerr << "Unexpected dependency update strategy. Cannot convert for dm_dependency\n";
}
}
public:
@@ -72,7 +72,7 @@ namespace celix { namespace dm {
BaseServiceDependency& operator=(const BaseServiceDependency&) = delete;
/**
- * Wether the service dependency is valid.
+ * Whether the service dependency is valid.
*/
bool isValid() const { return valid; }
diff --git a/libs/framework/include/celix_bundle_activator.h b/libs/framework/include/celix_bundle_activator.h
index 9bb2f6a..b764bf1 100644
--- a/libs/framework/include/celix_bundle_activator.h
+++ b/libs/framework/include/celix_bundle_activator.h
@@ -103,7 +103,7 @@ celix_status_t celix_bundleActivator_destroy(void *userData, celix_bundle_contex
* This macro generated the required bundle activator functions. These can be used to more type safe bundle activator
* entries.
*
- * The macro will create the following bundlea activator functions:
+ * The macro will create the following bundle activator functions:
* - bundleActivator_create which allocates a pointer to the provided type.
* - bundleActivator_start/stop which will call the respectively provided typed start/stop functions.
* - bundleActivator_destroy will free the allocated for the provided type.
diff --git a/libs/framework/include/celix_bundle_context.h b/libs/framework/include/celix_bundle_context.h
index fc7d978..44b6f3c 100644
--- a/libs/framework/include/celix_bundle_context.h
+++ b/libs/framework/include/celix_bundle_context.h
@@ -90,7 +90,7 @@ typedef struct celix_service_registration_options {
/**
* The required service name. This is used to identify the service. A fully qualified name with a namespace is
- * advisable to prevent name collision. (e.g. EXAMPLE_PRESURE_SENSOR).
+ * advisable to prevent name collision. (e.g. EXAMPLE_PRESSURE_SENSOR).
*/
const char *serviceName;
@@ -185,7 +185,7 @@ typedef struct celix_service_filter_options {
const char* serviceName;
/**
- * The optional version range. If service are registerd with a service version this attribute can be used to
+ * The optional version range. If service are registered with a service version this attribute can be used to
* only select service with a version in the version range.
* It uses the maven version range format, e.g. [1.0.0,2.0.0) or [1.1.1], etc.
*/
@@ -512,7 +512,7 @@ typedef struct celix_service_use_options {
.useWithOwner = NULL}
/**
- * Use the services with the provided service filter optons using the provided callback. The Celix framework will
+ * Use the services with the provided service filter options using the provided callback. The Celix framework will
* ensure that the targeted service cannot be removed during the callback.
*
* The svc is should only be considered valid during the callback.
@@ -531,7 +531,7 @@ bool celix_bundleContext_useServiceWithOptions(
/**
- * Use the services with the provided service filter optons using the provided callback. The Celix framework will
+ * Use the services with the provided service filter options using the provided callback. The Celix framework will
* ensure that the targeted service cannot be removed during the callback.
*
* The svc is should only be considered valid during the callback.
diff --git a/libs/framework/include/celix_dm_service_dependency.h b/libs/framework/include/celix_dm_service_dependency.h
index 6908096..2d0ec4f 100644
--- a/libs/framework/include/celix_dm_service_dependency.h
+++ b/libs/framework/include/celix_dm_service_dependency.h
@@ -81,7 +81,7 @@ void celix_dmServiceDependency_destroy(celix_dm_service_dependency_t *dep);
celix_status_t celix_dmServiceDependency_setRequired(celix_dm_service_dependency_t *dependency, bool required);
/**
- * Specify if the servide dependency should add a C language filter for this dependency if no "service.lang" part if found the in the provided filter.
+ * Specify if the service dependency should add a C language filter for this dependency if no "service.lang" part is found the in the provided filter.
* Default is false
*/
celix_status_t celix_dmServiceDependency_setAddCLanguageFilter(celix_dm_service_dependency_t *dependency, bool addCLangFilter);
@@ -117,7 +117,7 @@ celix_dm_service_dependency_strategy_t celix_dmServiceDependency_getStrategy(cel
celix_status_t celix_dmServiceDependency_setService(celix_dm_service_dependency_t *dependency, const char* serviceName, const char* serviceVersionRange, const char* filter);
/**
- * Returns the service depenendy filter.
+ * Returns the service dependency filter.
*/
const char* celix_dmServiceDependency_getFilter(celix_dm_service_dependency_t *dependency);
diff --git a/libs/framework/include/celix_launcher.h b/libs/framework/include/celix_launcher.h
index 19ab9f9..032a091 100644
--- a/libs/framework/include/celix_launcher.h
+++ b/libs/framework/include/celix_launcher.h
@@ -46,7 +46,7 @@ extern "C" {
*
* @param argc argc as provided in a main function.
* @param argv argv as provided in a main function.
- * @param embeddedConfig The optional embbeded config, will be overriden with the config.properties if found.
+ * @param embeddedConfig The optional embedded config, will be overridden with the config.properties if found.
* @return CELIX_SUCCESS if successful.
*/
int celixLauncher_launchAndWaitForShutdown(int argc, char *argv[], celix_properties_t *embeddedConfig);
diff --git a/libs/framework/include/dm_activator.h b/libs/framework/include/dm_activator.h
index 3b9d89a..46d1c66 100644
--- a/libs/framework/include/dm_activator.h
+++ b/libs/framework/include/dm_activator.h
@@ -60,7 +60,7 @@ celix_status_t dm_init(void * userData, bundle_context_pt context, celix_depende
/**
* Should be implemented by a bundle specific DM activator.
- * Should deinitialize and deallocate the undle specific activator struct.
+ * Should deinitialize and deallocate the bundle specific activator struct.
*/
celix_status_t dm_destroy(void * userData, bundle_context_pt context, celix_dependency_manager_t *manager);
diff --git a/libs/framework/include/dm_service_dependency.h b/libs/framework/include/dm_service_dependency.h
index 0ff549e..90c3d5b 100644
--- a/libs/framework/include/dm_service_dependency.h
+++ b/libs/framework/include/dm_service_dependency.h
@@ -72,7 +72,7 @@ celix_status_t serviceDependency_destroy(celix_dm_service_dependency_t **dep) CE
celix_status_t serviceDependency_setRequired(celix_dm_service_dependency_t *dependency, bool required) CELIX_DEPRECATED_ATTR;
/**
- * Specify if the servide dependency should add a C language filter for this dependency if no "service.lang" part if found the in the provided filter.
+ * Specify if the service dependency should add a C language filter for this dependency if no "service.lang" part is found the in the provided filter.
* Default is false
*/
celix_status_t serviceDependency_setAddCLanguageFilter(celix_dm_service_dependency_t *dependency, bool addCLangFilter) CELIX_DEPRECATED_ATTR;
@@ -108,7 +108,7 @@ celix_status_t serviceDependency_getStrategy(celix_dm_service_dependency_t *depe
celix_status_t serviceDependency_setService(celix_dm_service_dependency_t *dependency, const char* serviceName, const char* serviceVersionRange, const char* filter) CELIX_DEPRECATED_ATTR;
/**
- * Returns the service depenendy filter.
+ * Returns the service dependency filter.
*/
celix_status_t serviceDependency_getFilter(celix_dm_service_dependency_t *dependency, const char** filter) CELIX_DEPRECATED_ATTR;
diff --git a/libs/framework/private/test/service_registration_test.cpp b/libs/framework/private/test/service_registration_test.cpp
index ea5efb4..e7c5de8 100644
--- a/libs/framework/private/test/service_registration_test.cpp
+++ b/libs/framework/private/test/service_registration_test.cpp
@@ -93,7 +93,7 @@ TEST(service_registration, create) {
registry_callback_t callback;
service_registry_pt registry = (service_registry_pt) 0x10;
callback.handle = registry;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x20;
unsigned long serviceId = 1UL;
void *service = (void *) 0x30;
@@ -127,7 +127,7 @@ TEST(service_registration, createServiceFactory) {
registry_callback_t callback;
service_registry_pt registry = (service_registry_pt) 0x10;
callback.handle = registry;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x20;
unsigned long serviceId = 1UL;
void *service = (void *) 0x30;
@@ -157,7 +157,7 @@ TEST(service_registration, createServiceFactory) {
TEST(service_registration, retain_release){
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, NULL, NULL);
LONGS_EQUAL(1, registration->refCount);
@@ -172,7 +172,7 @@ TEST(service_registration, retain_release){
TEST(service_registration, isValidTrue) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
void *service = (void *) 0x30;
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, service, NULL);
@@ -186,7 +186,7 @@ TEST(service_registration, isValidTrue) {
TEST(service_registration, isValidFalse) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, NULL, NULL);
bool valid = serviceRegistration_isValid(registration);
@@ -201,7 +201,7 @@ TEST(service_registration, isValidFalse) {
TEST(service_registration, invalidate) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
void *service = (void *) 0x30;
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, service, NULL);
@@ -219,7 +219,7 @@ TEST(service_registration, unregisterValid) {
callback.unregister = ( (callback_unregister_signature)serviceRegistry_unregisterService );
service_registry_pt registry = (service_registry_pt) 0x10;
callback.handle = registry;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x20;
void *service = (void *) 0x30;
service_registration_pt registration = serviceRegistration_create(callback, bundle, name, 0, service, NULL);
@@ -240,7 +240,7 @@ TEST(service_registration, unregisterValid) {
TEST(service_registration, unregisterInvalid) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x10;
service_registration_pt registration = serviceRegistration_create(callback, bundle, name, 0, NULL, NULL);
@@ -256,7 +256,7 @@ TEST(service_registration, unregisterInvalid) {
TEST(service_registration, getService) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x10;
void *service = (void *) 0x20;
service_registration_pt registration = serviceRegistration_create(callback, bundle, name, 0, service, NULL);
@@ -272,7 +272,7 @@ TEST(service_registration, getService) {
TEST(service_registration, getServiceFromFactory) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x10;
void *service = (void *) 0x30;
service_factory_pt factory = (service_factory_pt) malloc(sizeof(*factory));
@@ -298,7 +298,7 @@ TEST(service_registration, getServiceFromFactory) {
TEST(service_registration, ungetServiceFromFactory) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x10;
void *service = (void *) 0x30;
service_factory_pt factory = (service_factory_pt) malloc(sizeof(*factory));
@@ -326,7 +326,7 @@ TEST(service_registration, ungetServiceFromFactory) {
TEST(service_registration, getProperties) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 5, NULL, NULL);
properties_pt actual = NULL;
@@ -349,7 +349,7 @@ TEST(service_registration, setProperties){
callback.modified = (callback_modified_signature) serviceRegistry_servicePropertiesModified;
service_registry_pt registry = (service_registry_pt) 0x10;
callback.handle = registry;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, NULL, NULL);
properties_pt properties = properties_create();
@@ -371,7 +371,7 @@ TEST(service_registration, setProperties){
TEST(service_registration, getServiceName) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, NULL, NULL);
const char *actual = NULL;
@@ -385,7 +385,7 @@ TEST(service_registration, getServiceName) {
TEST(service_registration, getBundle) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
bundle_pt bundle = (bundle_pt) 0x10;
service_registration_pt registration = serviceRegistration_create(callback, bundle, name, 0, NULL, NULL);
@@ -400,7 +400,7 @@ TEST(service_registration, getBundle) {
TEST(service_registration, getBundleIllegalArgument) {
registry_callback_t callback;
- char * name = my_strdup("sevice_name");
+ char * name = my_strdup("service_name");
service_registration_pt registration = serviceRegistration_create(callback, NULL, name, 0, NULL, NULL);
bundle_pt actual = (bundle_pt) 0x01;
diff --git a/libs/framework/private/test/service_registry_test.cpp b/libs/framework/private/test/service_registry_test.cpp
index 9614844..6f8aabc 100644
--- a/libs/framework/private/test/service_registry_test.cpp
+++ b/libs/framework/private/test/service_registry_test.cpp
@@ -82,7 +82,7 @@ static const char * registry_callback_t_toString(const void* object)
{
char buff[512];
registry_callback_t callback = *(registry_callback_t*) object;
- snprintf(buff, 512, "getUsingBudles: %p, handle: %p, modified: %p, unregister: %p", callback.getUsingBundles, callback.handle, callback.modified, callback.unregister);
+ snprintf(buff, 512, "getUsingBundles: %p, handle: %p, modified: %p, unregister: %p", callback.getUsingBundles, callback.handle, callback.modified, callback.unregister);
return my_strdup(buff);
}
diff --git a/libs/framework/src/bundle_cache.h b/libs/framework/src/bundle_cache.h
index c9de996..a9feb74 100644
--- a/libs/framework/src/bundle_cache.h
+++ b/libs/framework/src/bundle_cache.h
@@ -66,7 +66,7 @@ celix_status_t bundleCache_destroy(bundle_cache_pt *cache);
/**
* Recreates and retrieves the list of archives for the given bundle cache.
- * Archives are recreated on the bundle cache memory pool, the list for the results is created on the suplied pool, and is owned by the caller.
+ * Archives are recreated on the bundle cache memory pool, the list for the results is created on the supplied pool, and is owned by the caller.
*
* @param cache The cache to recreate archives out
* @param pool The pool on which the list of archives is created
diff --git a/libs/framework/src/bundle_context.c b/libs/framework/src/bundle_context.c
index ced4382..7e3c731 100644
--- a/libs/framework/src/bundle_context.c
+++ b/libs/framework/src/bundle_context.c
@@ -261,8 +261,8 @@ celix_status_t bundleContext_getService(bundle_context_pt context, service_refer
celix_status_t status = CELIX_SUCCESS;
if (context != NULL && reference != NULL && service_instance != NULL) {
- /*NOTE argument service_instance should be considerd a 'const void**'.
- To ensure backwards compatiblity a cast is made instead.
+ /*NOTE argument service_instance should be considered a 'const void**'.
+ To ensure backwards compatibility a cast is made instead.
*/
status = fw_getService(context->framework, context->bundle, reference, (const void**) service_instance);
} else {
diff --git a/libs/framework/src/celix_launcher.c b/libs/framework/src/celix_launcher.c
index 693e95d..87284eb 100644
--- a/libs/framework/src/celix_launcher.c
+++ b/libs/framework/src/celix_launcher.c
@@ -52,7 +52,7 @@ static void ignore(int signal);
static int celixLauncher_launchWithConfigAndProps(const char *configFile, framework_pt *framework, properties_pt packedConfig);
-static void combine_properties(celix_properties_t *orignal, const celix_properties_t *append);
+static void combine_properties(celix_properties_t *original, const celix_properties_t *append);
#define DEFAULT_CONFIG_FILE "config.properties"
@@ -248,11 +248,11 @@ static void show_properties(celix_properties_t *embeddedProps, const char *confi
celix_properties_destroy(keys);
}
-static void combine_properties(celix_properties_t *orignal, const celix_properties_t *append) {
- if (orignal != NULL && append != NULL) {
+static void combine_properties(celix_properties_t *original, const celix_properties_t *append) {
+ if (original != NULL && append != NULL) {
const char *key = NULL;
CELIX_PROPERTIES_FOR_EACH(append, key) {
- celix_properties_set(orignal, key, celix_properties_get(append, key, NULL));
+ celix_properties_set(original, key, celix_properties_get(append, key, NULL));
}
}
}
\ No newline at end of file
diff --git a/libs/framework/src/celix_log.c b/libs/framework/src/celix_log.c
index c4d51e2..40c6480 100644
--- a/libs/framework/src/celix_log.c
+++ b/libs/framework/src/celix_log.c
@@ -34,7 +34,7 @@ void framework_log(framework_logger_pt logger, framework_log_level_t level, cons
va_start(listPointer, fmsg);
vsprintf(msg, fmsg, listPointer);
- //FIXME logger and/or logger->logFucntion can be null. But this solution is not thread safe!
+ //FIXME logger and/or logger->logFunction can be null. But this solution is not thread safe!
if (logger != NULL && logger->logFunction != NULL) {
logger->logFunction(level, func, file, line, msg);
}
diff --git a/libs/framework/src/dm_event.c b/libs/framework/src/dm_event.c
index 9341832..6375c4d 100644
--- a/libs/framework/src/dm_event.c
+++ b/libs/framework/src/dm_event.c
@@ -43,7 +43,7 @@ celix_status_t event_create(dm_event_type_e event_type, bundle_pt bundle, bundle
serviceReference_getProperty(reference, OSGI_FRAMEWORK_SERVICE_ID, &serviceIdStr);
unsigned long servId = strtoul(serviceIdStr,NULL,10);
- //FIXME service ranking can dynamicly change, but service reference can be removed at any time.
+ //FIXME service ranking can dynamically change, but service reference can be removed at any time.
const char* rankingStr = NULL;
serviceReference_getProperty(reference, OSGI_FRAMEWORK_SERVICE_RANKING, &rankingStr);
long ranking = rankingStr == NULL ? 0 : atol(rankingStr);
diff --git a/libs/framework/src/dm_service_dependency.c b/libs/framework/src/dm_service_dependency.c
index 583916d..6d86bb9 100644
--- a/libs/framework/src/dm_service_dependency.c
+++ b/libs/framework/src/dm_service_dependency.c
@@ -476,7 +476,7 @@ celix_status_t serviceDependency_invokeSet(celix_dm_service_dependency_t *depend
serviceReferences = serviceTracker_getServiceReferences(dependency->tracker);
- /* Find the service with the higest ranking */
+ /* Find the service with the highest ranking */
for (i = 0; i < arrayList_size(serviceReferences); i++) {
service_reference_pt serviceReference = arrayList_get(serviceReferences, i);
const char* ranking_value;
diff --git a/libs/framework/src/framework.c b/libs/framework/src/framework.c
index de14161..bb32bc2 100644
--- a/libs/framework/src/framework.c
+++ b/libs/framework/src/framework.c
@@ -2477,11 +2477,11 @@ static celix_status_t frameworkActivator_stop(void * userData, bundle_context_t
fw_log(framework->logger, OSGI_FRAMEWORK_LOG_DEBUG, "FRAMEWORK: Start shutdownthread");
celixThreadMutex_lock(&framework->shutdown.mutex);
- bool alreadyIntialized = framework->shutdown.initialized;
+ bool alreadyInitialized = framework->shutdown.initialized;
framework->shutdown.initialized = true;
celixThreadMutex_unlock(&framework->shutdown.mutex);
- if (!alreadyIntialized) {
+ if (!alreadyInitialized) {
celixThreadMutex_lock(&framework->dispatcher.mutex);
framework->dispatcher.active = false;
celixThreadCondition_broadcast(&framework->dispatcher.cond);
diff --git a/libs/framework/src/service_reference.c b/libs/framework/src/service_reference.c
index e39e912..e6a3c4b 100644
--- a/libs/framework/src/service_reference.c
+++ b/libs/framework/src/service_reference.c
@@ -152,7 +152,7 @@ celix_status_t serviceReference_getService(service_reference_pt ref, void **serv
celix_status_t status = CELIX_SUCCESS;
celixThreadRwlock_readLock(&ref->lock);
/*NOTE the service argument should be 'const void**'
- To ensure backwards compatability a cast is made instead.
+ To ensure backwards compatibility a cast is made instead.
*/
*service = (const void**) ref->service;
celixThreadRwlock_unlock(&ref->lock);
@@ -270,7 +270,7 @@ celix_status_t serviceReference_isValid(service_reference_pt ref, bool *result)
bool serviceReference_isAssignableTo(service_reference_pt reference __attribute__((unused)), bundle_pt requester __attribute__((unused)), const char* serviceName __attribute__((unused))) {
bool allow = true;
- /*NOTE for now always true. It would be nice to be able to do somechecks if the services are really assignable.
+ /*NOTE for now always true. It would be nice to be able to do some checks if the services are really assignable.
*/
return allow;
diff --git a/libs/framework/src/service_registry.c b/libs/framework/src/service_registry.c
index 62c0d2f..ea7effd 100644
--- a/libs/framework/src/service_registry.c
+++ b/libs/framework/src/service_registry.c
@@ -673,7 +673,7 @@ celix_status_t serviceRegistry_getService(service_registry_pt registry, bundle_p
}
/* NOTE the out argument of sr_getService should be 'const void**'
- To ensure backwards compatability a cast is made instead.
+ To ensure backwards compatibility a cast is made instead.
*/
serviceReference_getService(reference, (void **)out);
} else {
@@ -704,7 +704,7 @@ celix_status_t serviceRegistry_ungetService(service_registry_pt registry, bundle
subStatus = serviceReference_decreaseUsage(reference, &count);
if (count == 0) {
/*NOTE the argument service of sr_getService should be 'const void**'
- TO ensure backwards compatability a cast is made instead.
+ To ensure backwards compatibility a cast is made instead.
*/
serviceReference_getService(reference, (void**)&service);
serviceReference_getServiceRegistration(reference, ®);
diff --git a/libs/framework/tst/multiple_frameworks_test.cpp b/libs/framework/tst/multiple_frameworks_test.cpp
index 6fe1377..8c5eea3 100644
--- a/libs/framework/tst/multiple_frameworks_test.cpp
+++ b/libs/framework/tst/multiple_frameworks_test.cpp
@@ -82,13 +82,13 @@ extern "C" {
}
static void testFrameworks(void) {
- printf("testing startup/shutdown mutiple frameworks\n");
+ printf("testing startup/shutdown multiple frameworks\n");
}
}
-TEST_GROUP(CelixMutipleFramworks) {
+TEST_GROUP(CelixMultipleFrameworks) {
void setup() {
setupFm();
}
@@ -98,6 +98,6 @@ TEST_GROUP(CelixMutipleFramworks) {
}
};
-TEST(CelixMutipleFramworks, testFrameworks) {
+TEST(CelixMultipleFrameworks, testFrameworks) {
testFrameworks();
}
diff --git a/libs/framework/tst/single_framework_test.cpp b/libs/framework/tst/single_framework_test.cpp
index e130dc0..307eb1b 100644
--- a/libs/framework/tst/single_framework_test.cpp
+++ b/libs/framework/tst/single_framework_test.cpp
@@ -118,7 +118,7 @@ TEST(FrameworkFactory, restartFramework) {
CHECK(fw != NULL);
- /* TODO fix mem leak in restarting framwork
+ /* TODO fix mem leak in restarting framework
framework_stop(fw);
framework_start(fw);
framework_stop(fw);
diff --git a/libs/utils/docs/thpool/FAQ.md b/libs/utils/docs/thpool/FAQ.md
index 0eea250..4bb9206 100644
--- a/libs/utils/docs/thpool/FAQ.md
+++ b/libs/utils/docs/thpool/FAQ.md
@@ -11,13 +11,13 @@ Interestingly using `pthread_exit()` results in much more memory being allocated
### Why do you use sleep() after calling thpool_destroy()?
This is needed only in the tests. The reason is that if you call thpool_destroy
-and then exit immedietely, maybe the program will exit before all the threads
+and then exit immediately, maybe the program will exit before all the threads
had the time to deallocate. In that way it is impossible to check for memory
leaks.
In production you don't have to worry about this since if you call exit,
-immedietely after you destroyied the pool, the threads will be freed
-anyway by the OS. If you eitherway destroy the pool in the middle of your
+immediately after you destroyed the pool, the threads will be freed
+anyway by the OS. If you either way destroy the pool in the middle of your
program it doesn't matter again since the program will not exit immediately
and thus threads will have more than enough time to terminate.
diff --git a/libs/utils/include/celix_threads.h b/libs/utils/include/celix_threads.h
index bf6e1f6..a4bc54c 100644
--- a/libs/utils/include/celix_threads.h
+++ b/libs/utils/include/celix_threads.h
@@ -71,7 +71,7 @@ celix_thread_t celixThread_self(void);
int celixThread_equals(celix_thread_t thread1, celix_thread_t thread2);
-bool celixThread_initalized(celix_thread_t thread);
+bool celixThread_initialized(celix_thread_t thread);
typedef pthread_mutex_t celix_thread_mutex_t;
diff --git a/libs/utils/private/test/celix_threads_test.cpp b/libs/utils/private/test/celix_threads_test.cpp
index e5f3014..1565c3a 100644
--- a/libs/utils/private/test/celix_threads_test.cpp
+++ b/libs/utils/private/test/celix_threads_test.cpp
@@ -189,7 +189,7 @@ TEST(celix_thread, exit) {
free(status);
}
-//HORIBLE TEST
+//HORRIBLE TEST
TEST(celix_thread, detach) {
int ret;
@@ -206,10 +206,10 @@ TEST(celix_thread, self) {
CHECK(celixThread_equals(thread, thread2));
}
-TEST(celix_thread, initalized) {
- CHECK(!celixThread_initalized(thread));
+TEST(celix_thread, initialized) {
+ CHECK(!celixThread_initialized(thread));
celixThread_create(&thread, NULL, thread_test_func_detach, NULL);
- CHECK(celixThread_initalized(thread));
+ CHECK(celixThread_initialized(thread));
celixThread_detach(thread);
}
@@ -299,7 +299,7 @@ TEST(celix_thread_mutex, attrSettype) {
//test recursive mutex
celixThreadMutexAttr_settype(&mu_attr, CELIX_THREAD_MUTEX_RECURSIVE);
celixThreadMutex_create(&mu, &mu_attr);
- //if program doesnt deadlock: succes! also check factorial of 10, for reasons unknown
+ //if program doesnt deadlock: success! also check factorial of 10, for reasons unknown
LONGS_EQUAL(3628800, thread_test_func_recur_lock(&mu, 10));
celixThreadMutex_destroy(&mu);
@@ -516,7 +516,7 @@ static int thread_test_func_recur_lock(celix_thread_mutex_t *mu, int i) {
static void * thread_test_func_kill(void __attribute__((unused)) *arg){
int * ret = (int*) malloc(sizeof(*ret));
- //sleep for a about a minute, or until a kill signal (USR1) is recieved
+ //sleep for a about a minute, or until a kill signal (USR1) is received
*ret = usleep(60000000);
return ret;
}
diff --git a/libs/utils/private/test/hash_map_test.cpp b/libs/utils/private/test/hash_map_test.cpp
index a50b377..8a050b0 100644
--- a/libs/utils/private/test/hash_map_test.cpp
+++ b/libs/utils/private/test/hash_map_test.cpp
@@ -418,8 +418,8 @@ TEST(hash_map, remove){
// Add second entry with null key
hashMap_put(map, key2, value2);
- // Remove unexisting entry for map
- removeKey = my_strdup("unexisting");
+ // Remove non-existing entry for map
+ removeKey = my_strdup("nonexisting");
hashMap_remove(map, removeKey);
LONGS_EQUAL(2, map->size);
CHECK(!hashMap_isEmpty(map));
@@ -431,7 +431,7 @@ TEST(hash_map, remove){
LONGS_EQUAL(0, map->size);
CHECK(hashMap_isEmpty(map));
- // Remove unexisting entry for empty map
+ // Remove non-existing entry for empty map
hashMap_remove(map, removeKey);
LONGS_EQUAL(0, map->size);
CHECK(hashMap_isEmpty(map));
@@ -592,7 +592,7 @@ TEST(hash_map, entryGetKey){
char * get;
hash_map_entry_pt entry;
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
hashMap_put(map, key3, value3);
@@ -622,7 +622,7 @@ TEST(hash_map, entryGetValue){
char * get;
hash_map_entry_pt entry;
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
hashMap_put(map, key3, value3);
@@ -699,7 +699,7 @@ TEST(hash_map_iterator, remove){
char * key3 = my_strdup("key3");
char * value3 = my_strdup("value3");
- // Add 3 entrys
+ // Add 3 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
hashMap_put(map, key3, value3);
@@ -734,7 +734,7 @@ TEST(hash_map_iterator, nextValue){
char * value2 = my_strdup("value2");
char * getValue;
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -761,7 +761,7 @@ TEST(hash_map_iterator, nextKey){
char * value2 = my_strdup("value2");
char * getKey;
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -789,7 +789,7 @@ TEST(hash_map_iterator, nextEntry){
char * getValue;
hash_map_entry_pt get;
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -832,7 +832,7 @@ TEST(hash_map_values, create){
char * key2 = my_strdup("key2");
char * value2 = my_strdup("value2");
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -852,7 +852,7 @@ TEST(hash_map_values, size){
char * key2 = my_strdup("key2");
char * value2 = my_strdup("value2");
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -871,7 +871,7 @@ TEST(hash_map_values, remove){
char * key2 = my_strdup("key2");
char * value2 = my_strdup("value2");
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -902,7 +902,7 @@ TEST(hash_map_values, clear){
char * key2 = my_strdup("key2");
char * value2 = my_strdup("value2");
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -932,7 +932,7 @@ TEST(hash_map_values, isEmpty){
char * key2 = my_strdup("key2");
char * value2 = my_strdup("value2");
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -970,7 +970,7 @@ TEST(hash_map_keySet, size){
LONGS_EQUAL(0, hashMapKeySet_size(key_set));
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, NULL);
hashMap_put(map, key2, NULL);
@@ -990,7 +990,7 @@ TEST(hash_map_keySet, contains){
CHECK(!hashMapKeySet_contains(key_set, key));
CHECK(!hashMapKeySet_contains(key_set, key2));
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, NULL);
CHECK(hashMapKeySet_contains(key_set, key));
@@ -1011,7 +1011,7 @@ TEST(hash_map_keySet, remove){
key_set = hashMapKeySet_create(map);
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, NULL);
hashMap_put(map, key2, NULL);
@@ -1036,7 +1036,7 @@ TEST(hash_map_keySet, clear){
key_set = hashMapKeySet_create(map);
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, NULL);
hashMap_put(map, key2, NULL);
@@ -1059,7 +1059,7 @@ TEST(hash_map_keySet, isEmpty){
CHECK(hashMapKeySet_isEmpty(key_set));
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, NULL);
hashMap_put(map, key2, NULL);
@@ -1095,7 +1095,7 @@ TEST(hash_map_entrySet, size){
LONGS_EQUAL(0, hashMapEntrySet_size(entry_set));
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -1114,7 +1114,7 @@ TEST(hash_map_entrySet, contains){
entry_set = hashMapEntrySet_create(map);
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -1134,7 +1134,7 @@ TEST(hash_map_entrySet, remove){
entry_set = hashMapEntrySet_create(map);
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -1163,7 +1163,7 @@ TEST(hash_map_entrySet, clear){
entry_set = hashMapEntrySet_create(map);
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -1190,7 +1190,7 @@ TEST(hash_map_entrySet, isEmpty){
CHECK(hashMapEntrySet_isEmpty(entry_set));
- // Add 2 entrys
+ // Add 2 entries
hashMap_put(map, key, value);
hashMap_put(map, key2, value2);
@@ -1414,7 +1414,7 @@ TEST(hash_map_hash, remove){
char * value = my_strdup("value");
char * key2 = NULL;
char * value2 = my_strdup("value2");
- char * removeKey = my_strdup("unexisting");
+ char * removeKey = my_strdup("nonexisting");
hashMap_clear(map, false, false);
@@ -1424,7 +1424,7 @@ TEST(hash_map_hash, remove){
// Add second entry with null key
hashMap_put(map, key2, value2);
- // Remove unexisting entry for map
+ // Remove non-existing entry for map
hashMap_remove(map, removeKey);
LONGS_EQUAL(2, map->size);
CHECK(!hashMap_isEmpty(map));
@@ -1441,8 +1441,8 @@ TEST(hash_map_hash, remove){
LONGS_EQUAL(0, map->size);
CHECK(hashMap_isEmpty(map));
- // Remove unexisting entry for empty map
- removeKey = my_strdup("unexisting");
+ // Remove non-existing entry for empty map
+ removeKey = my_strdup("nonexisting");
hashMap_remove(map, removeKey);
LONGS_EQUAL(0, map->size);
CHECK(hashMap_isEmpty(map));
diff --git a/libs/utils/private/test/linked_list_test.cpp b/libs/utils/private/test/linked_list_test.cpp
index 6a9e589..1df971b 100644
--- a/libs/utils/private/test/linked_list_test.cpp
+++ b/libs/utils/private/test/linked_list_test.cpp
@@ -238,7 +238,7 @@ TEST(linked_list, removeElement){
char * value2 = my_strdup("element2");
char * value3 = my_strdup("element3");
- //add 6 elemets
+ //add 6 elements
linkedList_addElement(list, NULL);
linkedList_addElement(list, value2);
linkedList_addElement(list, value);
diff --git a/libs/utils/src/celix_threads.c b/libs/utils/src/celix_threads.c
index 6af1192..f01d258 100644
--- a/libs/utils/src/celix_threads.c
+++ b/libs/utils/src/celix_threads.c
@@ -92,7 +92,7 @@ int celixThread_equals(celix_thread_t thread1, celix_thread_t thread2) {
return pthread_equal(thread1.thread, thread2.thread);
}
-bool celixThread_initalized(celix_thread_t thread) {
+bool celixThread_initialized(celix_thread_t thread) {
return thread.threadInitialized;
}
diff --git a/misc/roadmap/roadmap.md b/misc/roadmap/roadmap.md
index a3100be..fce9f7c 100644
--- a/misc/roadmap/roadmap.md
+++ b/misc/roadmap/roadmap.md
@@ -117,7 +117,6 @@ and a smaller footprint.
## Refactor service registry to a single threaded design (TODO issue)
Celix currently has some nested lock. It would be preferable to remove these, but this is difficult
because they are used to sync events which react on registering/unregistering services. Specially when
-a unregister/register event leads to other services being registered/unregisterd. One way to deal with
+a unregister/register event leads to other services being registered/unregistered. One way to deal with
this sync problem is to remove it by adding a single thread which handle al interaction between bundles
and the service registry.
-