From a4b426b18e831e0abfd842e0e524327d1566c514 Mon Sep 17 00:00:00 2001 From: hitstergtd Date: Mon, 25 Apr 2016 11:16:26 +0100 Subject: [PATCH] Problem: typos/trailing spaces in code comments Solution: fix them --- include/zmq.h | 2 +- src/select.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index ff7949e1..39378674 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -440,7 +440,7 @@ typedef struct zmq_pollitem_t ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); /******************************************************************************/ -/* Poller polling on sockets,fd and threaf safe sockets */ +/* Poller polling on sockets,fd and thread-safe sockets */ /******************************************************************************/ #define ZMQ_HAVE_POLLER diff --git a/src/select.cpp b/src/select.cpp index edc15821..eed18b15 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -104,8 +104,8 @@ void zmq::select_t::rm_fd (handle_t handle_) if (family_entry_it != current_family_entry_it) { // Family is not currently being iterated and can be safely - // modified in palce. So later it can be skipped withour re-verifying - // its content. + // modified in-place. So later it can be skipped without + // re-verifying its content. fd_entries_t::iterator fd_entry_it; for (fd_entry_it = family_entry.fd_entries.begin (); fd_entry_it != family_entry.fd_entries.end (); ++fd_entry_it) @@ -453,7 +453,7 @@ u_short zmq::select_t::get_fd_family (fd_t fd_) // AF_INET and AF_INET6 can be mixed in select // TODO: If proven otherwise, should simply return addr.sa_family if (rc != SOCKET_ERROR) - return addr.ss_family == AF_INET6 ? AF_INET : addr.ss_family; + return addr.ss_family == AF_INET6 ? AF_INET : addr.ss_family; } }