diff --git a/INSTALL b/INSTALL index 91cb0a5e..e7f1b0e8 100644 --- a/INSTALL +++ b/INSTALL @@ -145,7 +145,7 @@ error can be resolved by adding environment variable for shell. export XML_CATALOG_FILES=/usr/local/etc/xml/catalog -Write comamnd above in shell for instant resolve, or append command into +Write command above in shell for instant resolve, or append command into shell profile file and reload for permanent resolve. Compilers and Options diff --git a/SupportedPlatforms.md b/SupportedPlatforms.md index a5f51b84..118fe432 100644 --- a/SupportedPlatforms.md +++ b/SupportedPlatforms.md @@ -14,7 +14,7 @@ Supported platforms with primary CI - it is a precondition for merging a pull request that no builds or tests of these platforms are broken - contributors can easily enable these builds and tests for their branches in their fork -Suported platforms with secondary CI +Supported platforms with secondary CI - have builds and tests run for the master branch - these are monitored periodically by the project maintainers, and efforts are made to fix any broken builds or tests in a timely manner - it is a precondition for a release that no builds or tests of these platforms are broken diff --git a/builds/android/build.sh b/builds/android/build.sh index ba4201d0..667df7cc 100755 --- a/builds/android/build.sh +++ b/builds/android/build.sh @@ -52,7 +52,7 @@ mkdir -p "${cache}" # Check for environment variable to clear the prefix and do a clean build if [[ $ANDROID_BUILD_CLEAN ]]; then - echo "Doing a clean build (removing previous build and depedencies)..." + echo "Doing a clean build (removing previous build and dependencies)..." rm -rf "${ANDROID_BUILD_PREFIX}"/* fi diff --git a/builds/cmake/NSIS.template32.in b/builds/cmake/NSIS.template32.in index bc6ab8d5..0b7d2454 100644 --- a/builds/cmake/NSIS.template32.in +++ b/builds/cmake/NSIS.template32.in @@ -851,7 +851,7 @@ Section "Uninstall" @CPACK_NSIS_DELETE_ICONS@ @CPACK_NSIS_DELETE_ICONS_EXTRA@ - ;Delete empty start menu parent diretories + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" startMenuDeleteLoop: @@ -870,7 +870,7 @@ Section "Uninstall" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @CPACK_NSIS_DELETE_ICONS_EXTRA@ - ;Delete empty start menu parent diretories + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" secondStartMenuDeleteLoop: diff --git a/builds/cmake/NSIS.template64.in b/builds/cmake/NSIS.template64.in index 2deaa4ec..cb6beae5 100644 --- a/builds/cmake/NSIS.template64.in +++ b/builds/cmake/NSIS.template64.in @@ -854,7 +854,7 @@ Section "Uninstall" @CPACK_NSIS_DELETE_ICONS@ @CPACK_NSIS_DELETE_ICONS_EXTRA@ - ;Delete empty start menu parent diretories + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" startMenuDeleteLoop: @@ -873,7 +873,7 @@ Section "Uninstall" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @CPACK_NSIS_DELETE_ICONS_EXTRA@ - ;Delete empty start menu parent diretories + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" secondStartMenuDeleteLoop: diff --git a/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp b/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp index 30971040..d71f36ca 100644 --- a/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp +++ b/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp @@ -22,7 +22,7 @@ send random size message to each socket and check server answer #define CLIENT_COUNT 5 // client threads count #define CLIENT_CONNECTION 100 // ZMQ_CLIENT sockets at each client -#define CLIENT_RECCONECT 1000 // reconnect one socket after messages +#define CLIENT_RECONNECT 1000 // reconnect one socket after messages #define MESSAGE_MAX_SIZE 1024 @@ -157,7 +157,7 @@ void client(int num) client_ready++; while (client_ready < CLIENT_COUNT) Sleep(10); // wait while all clients open sockets - int recconect = 0; + int reconnect = 0; while(1) { int val[CLIENT_CONNECTION]; zmq_msg_t msg; @@ -179,8 +179,8 @@ void client(int num) client_cnt[num]++; } // reconnect one - recconect++; - if(recconect == CLIENT_RECCONECT) { + reconnect++; + if(reconnect == CLIENT_RECONNECT) { int n = rand() % CLIENT_CONNECTION; zmq_close(sock[n]); sock[n] = zmq_socket(ctx, ZMQ_CLIENT); assert(sock[n]); diff --git a/builds/nuget/readme.nuget b/builds/nuget/readme.nuget index 633743a9..aa6fec8a 100644 --- a/builds/nuget/readme.nuget +++ b/builds/nuget/readme.nuget @@ -2,7 +2,7 @@ NuGet is a package management system for MS-Windows. It is similar in spirit to tools like Maven or Gradle. -It was originaly for .Net only packages but it has +It was originally for .Net only packages but it has recently been augmented to working with native packages. http://docs.nuget.org/docs/reference/support-for-native-projects diff --git a/builds/zos/README.md b/builds/zos/README.md index f15c182f..f63e3919 100644 --- a/builds/zos/README.md +++ b/builds/zos/README.md @@ -33,7 +33,7 @@ installed, ZeroMQ can be built as follows: * Download and extract ZeroMQ tar file * Ensure contents of this directory are present at `builds/zos` - within that extracted diretory (eg, `zeromq-VERSION/builds/zos/`; + within that extracted directory (eg, `zeromq-VERSION/builds/zos/`; copy these files in, if not already present, and make sure the shell scripts are executable) @@ -238,7 +238,7 @@ them, and it would be non-trivial to track them by hand.) The source code in ZeroMQ is a combination of a C++ core library (in `*.cpp` and `*.hpp` files), and a C wrapper (also in `*.cpp` files). It is all compiled with the C++ compiler. The IBM XL C/C++ -complier (at least the version used for initial porting) insists +compiler (at least the version used for initial porting) insists that C++ source be in `*.C` files (note capital C). To work around this issue the compile flag `-+` is used (specified in the `zc++` compiler wrapper), which tells the compiler the file should be @@ -359,7 +359,7 @@ syntax): setenv CXXFLAGS "-Wc,xplink -Wl,xplink -+" * run configure script with `--disable-eventfd` (`sys/eventfd.h` does - not exist, but the test for its existance has a false positive on + not exist, but the test for its existence has a false positive on z/OS UNIX System Services, apparently due to the way the `c++` compiler wrapper passes errors back from the IBM XL C/C++ compiler), and with `--with-poller=poll` because `poll` is the most advanced diff --git a/builds/zos/runtests b/builds/zos/runtests index e7963e36..2351f2c5 100755 --- a/builds/zos/runtests +++ b/builds/zos/runtests @@ -85,7 +85,7 @@ verbose() { TESTS_ENVIRONMENT= #--------------------------------------------------------------------------- -# Explicitly add SRCDIR into library serach path, to make sure we +# Explicitly add SRCDIR into library search path, to make sure we # use our just-built version LIBPATH="${SRCDIR}:/lib:/usr/lib" export LIBPATH diff --git a/builds/zos/zc++ b/builds/zos/zc++ index f7845684..7cd22474 100755 --- a/builds/zos/zc++ +++ b/builds/zos/zc++ @@ -5,7 +5,7 @@ # to get through both ./configure arguments _and_ Makefile/shell expansion # safely so more easily added in this wrapper. # -# Finally, by default will enable xplink for C++ compatibilty and performance +# Finally, by default will enable xplink for C++ compatibility and performance # (c++ standard library requires xplink enabled). # # Additional compile/link flags can be passed in as ZCXXFLAGS, eg: diff --git a/configure.ac b/configure.ac index 4d2b4649..ed6bf44e 100644 --- a/configure.ac +++ b/configure.ac @@ -599,7 +599,7 @@ elif test "x$with_libsodium" = "xyes"; then if test "x$enable_libsodium_randombytes_close" = "xyes"; then AC_DEFINE(ZMQ_LIBSODIUM_RANDOMBYTES_CLOSE, [1], [Automatically close libsodium randombytes. Not threadsafe without getrandom()]) else - AC_MSG_NOTICE([Disabling libsodium randombytes_close(). randombytes_close() may need to be called in applcation code.]) + AC_MSG_NOTICE([Disabling libsodium randombytes_close(). randombytes_close() may need to be called in application code.]) fi curve_library="libsodium" diff --git a/doc/zmq_disconnect.txt b/doc/zmq_disconnect.txt index faa77f57..0b2783d7 100644 --- a/doc/zmq_disconnect.txt +++ b/doc/zmq_disconnect.txt @@ -19,7 +19,7 @@ by the 'socket' argument from the endpoint specified by the 'endpoint' argument. Note the actual disconnect system call might occur at a later time. Upon disconnection the will also stop receiving messages originating from -this endpoint. Moreover, the socket will no longuer be able +this endpoint. Moreover, the socket will no longer be able to queue outgoing messages to this endpoint. The outgoing message queue associated with the endpoint will be discarded. However, if the socket's linger period is non-zero, libzmq will still attempt to transmit these discarded messages, diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt index fcad5c3b..67eb6181 100644 --- a/doc/zmq_getsockopt.txt +++ b/doc/zmq_getsockopt.txt @@ -624,7 +624,7 @@ ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval The 'ZMQ_RECONNECT_IVL_MAX' option shall retrieve the maximum reconnection interval for the specified 'socket'. This is the maximum period 0MQ shall wait between attempts to reconnect. On each reconnect attempt, the previous interval -shall be doubled untill ZMQ_RECONNECT_IVL_MAX is reached. This allows for +shall be doubled until ZMQ_RECONNECT_IVL_MAX is reached. This allows for exponential backoff strategy. Default value means no exponential backoff is performed and reconnect interval calculations are only based on ZMQ_RECONNECT_IVL. diff --git a/doc/zmq_pgm.txt b/doc/zmq_pgm.txt index 3b23f936..4233af4a 100644 --- a/doc/zmq_pgm.txt +++ b/doc/zmq_pgm.txt @@ -134,7 +134,7 @@ CONFIGURATION ------------- The PGM is protocol is capable of multicasting data at high rates (500Mbps+) -with large messages (1MB+), however it requires setting the relevent ZMQ socket +with large messages (1MB+), however it requires setting the relevant ZMQ socket options that are documented in linkzmq:zmq_setsockopt[3]: * The 'ZMQ_RATE' should be set sufficiently high, e.g. 1Gbps diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt index ddfb3911..ec2e3279 100644 --- a/doc/zmq_poll.txt +++ b/doc/zmq_poll.txt @@ -71,7 +71,7 @@ _zmq_poll()_. *ZMQ_POLLPRI*:: For 0MQ sockets this flags is of no use. For standard sockets this means there -is urgent data to read. Refer to the POLLPRI flag for more informations. +is urgent data to read. Refer to the POLLPRI flag for more information. For file descriptor, refer to your use case: as an example, GPIO interrupts are signaled through a POLLPRI event. This flag has no effect on Windows. @@ -86,7 +86,7 @@ The *zmq_pollitem_t* array must only be used by the thread which will/is calling _zmq_poll_. If a socket is contained in multiple *zmq_pollitem_t* arrays, each owned by a -different thread, the socket itself needs to be thead-safe (Server, Client, ...). +different thread, the socket itself needs to be thread-safe (Server, Client, ...). Otherwise, behaviour is undefined. diff --git a/doc/zmq_poller.txt b/doc/zmq_poller.txt index a52995cf..89f43516 100644 --- a/doc/zmq_poller.txt +++ b/doc/zmq_poller.txt @@ -91,7 +91,7 @@ associated with the socket registration, and requires that the _socket_ remains valid. _zmq_poller_add_fd_, _zmq_poller_modify_fd_ and _zmq_poller_remove_fd_ are -analogous to the previous functions but manage regular file descriptiors +analogous to the previous functions but manage regular file descriptors registered with a poller. On Windows, these functions can only be used with WinSock sockets. @@ -185,7 +185,7 @@ For 0MQ sockets this flag has no effect on the _zmq_poller_add_ and _zmq_poller_modify_ functions, and is never set in the 'events' member of the zmq_poller_event_t structure. For standard sockets this means there -is urgent data to read. Refer to the POLLPRI flag for more informations. +is urgent data to read. Refer to the POLLPRI flag for more information. For a file descriptor, refer to your OS documentation: as an example, GPIO interrupts are signaled through a POLLPRI event. This flag has no effect on Windows. diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt index 3ed69769..574f88de 100644 --- a/doc/zmq_setsockopt.txt +++ b/doc/zmq_setsockopt.txt @@ -257,7 +257,7 @@ Default value:: NULL Applicable socket types:: ZMQ_ROUTER, ZMQ_SERVER and ZMQ_PEER -ZMQ_HICCUP_MSG: set a hiccup message that the socket will generate when connected peer temporarly disconnect +ZMQ_HICCUP_MSG: set a hiccup message that the socket will generate when connected peer temporarily disconnect ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ When set, the socket will generate a hiccup message when connect peer has been disconnected. You may set this on DEALER, CLIENT and PEER sockets. @@ -527,9 +527,9 @@ ZMQ_METADATA: Add application metadata properties to a socket ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The _ZMQ_METADATA_ option shall add application metadata to the specified _socket_, the metadata is exchanged with peers during connection setup. A metadata property is -specfied as a string, delimited by a colon, starting with the metadata _property_ +specified as a string, delimited by a colon, starting with the metadata _property_ followed by the metadata value, for example "X-key:value". -_Property_ names are restrited to maximum 255 characters and must be prefixed by "X-". +_Property_ names are restricted to maximum 255 characters and must be prefixed by "X-". Multiple application metadata properties can be added to a socket by executing zmq_setsockopt() multiple times. As the argument is a null-terminated string, binary data must be encoded before it is added e.g. using Z85 (linkzmq:zmq_z85_encode[3]). @@ -755,7 +755,7 @@ ZMQ_RECONNECT_IVL_MAX: Set maximum reconnection interval The 'ZMQ_RECONNECT_IVL_MAX' option shall set the maximum reconnection interval for the specified 'socket'. This is the maximum period 0MQ shall wait between attempts to reconnect. On each reconnect attempt, the previous interval shall be -doubled untill ZMQ_RECONNECT_IVL_MAX is reached. This allows for exponential +doubled until ZMQ_RECONNECT_IVL_MAX is reached. This allows for exponential backoff strategy. Default value means no exponential backoff is performed and reconnect interval calculations are only based on ZMQ_RECONNECT_IVL. @@ -1238,7 +1238,7 @@ Applicable socket types:: ZMQ_XPUB, ZMQ_PUB ZMQ_XPUB_WELCOME_MSG: set welcome message that will be received by subscriber when connecting ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Sets a welcome message the will be recieved by subscriber when connecting. +Sets a welcome message the will be received by subscriber when connecting. Subscriber must subscribe to the Welcome message before connecting. Welcome message will also be sent on reconnecting. For welcome message to work well user must poll on incoming subscription messages on the XPUB socket and handle them. diff --git a/doc/zmq_tcp.txt b/doc/zmq_tcp.txt index 11088a72..415cb227 100644 --- a/doc/zmq_tcp.txt +++ b/doc/zmq_tcp.txt @@ -76,7 +76,7 @@ HWM For the TCP transport, the high water mark (HWM) mechanism works in conjunction with the TCP socket buffers handled at OS level. Depending on the OS and several other factors the size of such TCP buffers will -be different. Moreover TCP buffers provided by the OS will accomodate a varying +be different. Moreover TCP buffers provided by the OS will accommodate a varying number of messages depending on the size of messages (unlike ZMQ HWM settings the TCP socket buffers are measured in bytes and not messages). diff --git a/doc/zmq_unbind.txt b/doc/zmq_unbind.txt index 1ae33b18..f2304e6c 100644 --- a/doc/zmq_unbind.txt +++ b/doc/zmq_unbind.txt @@ -18,7 +18,7 @@ The _zmq_unbind()_ function shall unbind a socket specified by the 'socket' argument from the endpoint specified by the 'endpoint' argument. -Addionally the incoming message queue associated with the endpoint will be +Additionally the incoming message queue associated with the endpoint will be discarded. This means that after unbinding an endpoint it is possible to received messages originating from that same endpoint if they were already present in the incoming message queue before unbinding. diff --git a/src/generic_mtrie_impl.hpp b/src/generic_mtrie_impl.hpp index 4a7a353d..19f3694e 100644 --- a/src/generic_mtrie_impl.hpp +++ b/src/generic_mtrie_impl.hpp @@ -159,12 +159,12 @@ void generic_mtrie_t::rm (value_t *pipe_, Arg arg_, bool call_on_uniq_) { - // This used to be implemented as a non-tail recursive travesal of the trie, + // This used to be implemented as a non-tail recursive traversal of the trie, // which means remote clients controlled the depth of the recursion and the // stack size. // To simulate the non-tail recursion, with post-recursion changes depending on // the result of the recursive call, a stack is used to re-visit the same node - // and operate on it again after children have been visisted. + // and operate on it again after children have been visited. // A boolean is used to record whether the node had already been visited and to // determine if the pre- or post- children visit actions have to be taken. // In the case of a node with (N > 1) children, the node has to be re-visited @@ -401,12 +401,12 @@ template typename generic_mtrie_t::rm_result generic_mtrie_t::rm (prefix_t prefix_, size_t size_, value_t *pipe_) { - // This used to be implemented as a non-tail recursive travesal of the trie, + // This used to be implemented as a non-tail recursive traversal of the trie, // which means remote clients controlled the depth of the recursion and the // stack size. // To simulate the non-tail recursion, with post-recursion changes depending on // the result of the recursive call, a stack is used to re-visit the same node - // and operate on it again after children have been visisted. + // and operate on it again after children have been visited. // A boolean is used to record whether the node had already been visited and to // determine if the pre- or post- children visit actions have to be taken. rm_result ret = not_found; diff --git a/src/ip.cpp b/src/ip.cpp index 8d1ea13b..a0fa6f28 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -307,7 +307,7 @@ bool zmq::initialize_network () #endif #ifdef ZMQ_HAVE_WINDOWS - // Intialise Windows sockets. Note that WSAStartup can be called multiple + // Initialise Windows sockets. Note that WSAStartup can be called multiple // times given that WSACleanup will be called for each WSAStartup. const WORD version_requested = MAKEWORD (2, 2); diff --git a/src/ip.hpp b/src/ip.hpp index 34cc06c4..bceb8313 100644 --- a/src/ip.hpp +++ b/src/ip.hpp @@ -77,7 +77,7 @@ void make_socket_noninheritable (fd_t sock_); // Asserts that: // - an internal 0MQ error did not occur, -// - and, if a socket error occured, it can be recovered from. +// - and, if a socket error occurred, it can be recovered from. void assert_success_or_recoverable (fd_t s_, int rc_); #ifdef ZMQ_HAVE_IPC diff --git a/src/options.hpp b/src/options.hpp index bd238e50..f21e5b95 100644 --- a/src/options.hpp +++ b/src/options.hpp @@ -167,7 +167,7 @@ struct options_t std::string socks_proxy_address; // Credentials for SOCKS proxy. - // Conneciton method will be basic auth if username + // Connection method will be basic auth if username // is not empty, no auth otherwise. std::string socks_proxy_username; std::string socks_proxy_password; diff --git a/src/own.cpp b/src/own.cpp index f74824bb..a7b29651 100644 --- a/src/own.cpp +++ b/src/own.cpp @@ -74,7 +74,7 @@ void zmq::own_t::process_seqnum () // Catch up with counter of processed commands. _processed_seqnum++; - // We may have catched up and still have pending terms acks. + // We may have caught up and still have pending terms acks. check_term_acks (); } diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp index 3c68f23b..a11989b0 100644 --- a/src/pgm_sender.cpp +++ b/src/pgm_sender.cpp @@ -96,7 +96,7 @@ void zmq::pgm_sender_t::plug (io_thread_t *io_thread_, session_base_t *session_) rdata_notify_handle = add_fd (rdata_notify_fd); pending_notify_handle = add_fd (pending_notify_fd); - // Set POLLIN. We wont never want to stop polling for uplink = we never + // Set POLLIN. We will never want to stop polling for uplink = we never // want to stop processing NAKs. set_pollin (uplink_handle); set_pollin (rdata_notify_handle); diff --git a/src/req.cpp b/src/req.cpp index b9bb35b0..b120f570 100644 --- a/src/req.cpp +++ b/src/req.cpp @@ -281,7 +281,7 @@ int zmq::req_session_t::push_msg (msg_t *msg_) case bottom: if (msg_->flags () == msg_t::more) { // In case option ZMQ_CORRELATE is on, allow request_id to be - // transfered as first frame (would be too cumbersome to check + // transferred as first frame (would be too cumbersome to check // whether the option is actually on or not). if (msg_->size () == sizeof (uint32_t)) { _state = request_id; diff --git a/src/router.cpp b/src/router.cpp index 49c01f10..c659f265 100644 --- a/src/router.cpp +++ b/src/router.cpp @@ -420,7 +420,7 @@ bool zmq::router_t::xhas_out () { // In theory, ROUTER socket is always ready for writing (except when // MANDATORY is set). Whether actual attempt to write succeeds depends - // on whitch pipe the message is going to be routed to. + // on which pipe the message is going to be routed to. if (!_mandatory) return true; diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp index 0f7f58b3..d09bfe16 100644 --- a/src/udp_engine.cpp +++ b/src/udp_engine.cpp @@ -575,7 +575,7 @@ void zmq::udp_engine_t::in_event () msg.set_flags (msg_t::more); memcpy (msg.data (), group_buffer, group_size); - // This doesn't fit, just ingore + // This doesn't fit, just ignore if (nbytes - 1 < group_size) return; diff --git a/src/ws_engine.cpp b/src/ws_engine.cpp index d9debddf..615ffacb 100644 --- a/src/ws_engine.cpp +++ b/src/ws_engine.cpp @@ -136,7 +136,7 @@ void zmq::ws_engine_t::start_ws_handshake () protocol = "ZWS2.0/CURVE"; #endif else { - // Avoid unitialized variable error breaking UWP build + // Avoid uninitialized variable error breaking UWP build protocol = ""; assert (false); } diff --git a/src/xsub.cpp b/src/xsub.cpp index 3a8818c8..795e4bf3 100644 --- a/src/xsub.cpp +++ b/src/xsub.cpp @@ -139,7 +139,7 @@ int zmq::xsub_t::xsend (msg_t *msg_) if (msg_->is_subscribe () || (size > 0 && *data == 1)) { // Process subscribe message // This used to filter out duplicate subscriptions, - // however this is alread done on the XPUB side and + // however this is already done on the XPUB side and // doing it here as well breaks ZMQ_XPUB_VERBOSE // when there are forwarding devices involved. if (!msg_->is_subscribe ()) { diff --git a/src/ypipe.hpp b/src/ypipe.hpp index e30878f9..1c10136a 100644 --- a/src/ypipe.hpp +++ b/src/ypipe.hpp @@ -77,7 +77,7 @@ template class ypipe_t ZMQ_FINAL : public ypipe_base_t _queue.back () = value_; _queue.push (); - // Move the "flush up to here" poiter. + // Move the "flush up to here" pointer. if (!incomplete_) _f = &_queue.back (); } @@ -108,7 +108,7 @@ template class ypipe_t ZMQ_FINAL : public ypipe_base_t // Try to set 'c' to 'f'. if (_c.cas (_w, _f) != _w) { - // Compare-and-swap was unseccessful because 'c' is NULL. + // Compare-and-swap was unsuccessful because 'c' is NULL. // This means that the reader is asleep. Therefore we don't // care about thread-safeness and update c in non-atomic // manner. We'll return false to let the caller know @@ -163,7 +163,7 @@ template class ypipe_t ZMQ_FINAL : public ypipe_base_t return true; } - // Applies the function fn to the first elemenent in the pipe + // Applies the function fn to the first element in the pipe // and returns the value returned by the fn. // The pipe mustn't be empty or the function crashes. bool probe (bool (*fn_) (const T &)) diff --git a/src/ypipe_conflate.hpp b/src/ypipe_conflate.hpp index aa0731d1..7c96d574 100644 --- a/src/ypipe_conflate.hpp +++ b/src/ypipe_conflate.hpp @@ -97,7 +97,7 @@ template class ypipe_conflate_t ZMQ_FINAL : public ypipe_base_t return dbuffer.read (value_); } - // Applies the function fn to the first elemenent in the pipe + // Applies the function fn to the first element in the pipe // and returns the value returned by the fn. // The pipe mustn't be empty or the function crashes. bool probe (bool (*fn_) (const T &)) { return dbuffer.probe (fn_); } diff --git a/tests/test_router_mandatory_hwm.cpp b/tests/test_router_mandatory_hwm.cpp index 870365b3..1b3ad9fa 100644 --- a/tests/test_router_mandatory_hwm.cpp +++ b/tests/test_router_mandatory_hwm.cpp @@ -35,7 +35,7 @@ SETUP_TEARDOWN_TESTCONTEXT // DEBUG shouldn't be defined in sources as it will cause a redefined symbol // error when it is defined in the build configuration. It appears that the // intent here is to semi-permanently disable DEBUG tracing statements, so the -// implementation is changed to accomodate that intent. +// implementation is changed to accommodate that intent. //#define DEBUG 0 #define TRACE_ENABLED 0 diff --git a/tests/test_security_gssapi.cpp b/tests/test_security_gssapi.cpp index ea4de370..2203d4d6 100644 --- a/tests/test_security_gssapi.cpp +++ b/tests/test_security_gssapi.cpp @@ -50,7 +50,7 @@ const char *name = "zmqtest2"; static volatile int zap_deny_all = 0; // -------------------------------------------------------------------------- -// This methods receives and validates ZAP requestes (allowing or denying +// This methods receives and validates ZAP requests (allowing or denying // each client connection). // N.B. on failure, each crypto type in keytab will be tried diff --git a/tests/test_spec_pushpull.cpp b/tests/test_spec_pushpull.cpp index 10ad68a2..4ffc7e62 100644 --- a/tests/test_spec_pushpull.cpp +++ b/tests/test_spec_pushpull.cpp @@ -266,7 +266,7 @@ void test_push_multipart_atomic_drop (const char *bind_address_, size_t zmq_events_size = sizeof (int); int zmq_events; - // Normal case - excercise the queues + // Normal case - exercise the queues send_string_expect_success (push, "0", ZMQ_SNDMORE); send_string_expect_success (push, "0", ZMQ_SNDMORE); TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));