diff --git a/evmap.c b/evmap.c index 90849654..fd884ebc 100644 --- a/evmap.c +++ b/evmap.c @@ -914,7 +914,7 @@ event_changelist_del_(struct event_base *base, evutil_socket_t fd, short old, sh "add, delete, dispatch" is not the same as "no-op, dispatch", we want the no-op behavior. - If we have a no-op item, we could remove it it from the list + If we have a no-op item, we could remove it from the list entirely, but really there's not much point: skipping the no-op change when we do the dispatch later is far cheaper than rejuggling the array now. diff --git a/evutil.c b/evutil.c index 1e9c0f67..45792c04 100644 --- a/evutil.c +++ b/evutil.c @@ -3004,7 +3004,7 @@ evutil_make_internal_pipe_(evutil_socket_t fd[2]) { /* Making the second socket nonblocking is a bit subtle, given that we - ignore any EAGAIN returns when writing to it, and you don't usally + ignore any EAGAIN returns when writing to it, and you don't usually do that for a nonblocking socket. But if the kernel gives us EAGAIN, then there's no need to add any more data to the buffer, since the main thread is already either about to wake up and drain it, diff --git a/kqueue-internal.h b/kqueue-internal.h index 02c5a360..5882e629 100644 --- a/kqueue-internal.h +++ b/kqueue-internal.h @@ -32,7 +32,7 @@ int event_kq_notify_base_(struct event_base *base); /** Prepare a kqueue-using event base to receive notifications via an internal - * EVFILT_USER event. Return 0 on sucess, -1 on failure. + * EVFILT_USER event. Return 0 on success, -1 on failure. */ int event_kq_add_notify_event_(struct event_base *base); diff --git a/test/regress_main.c b/test/regress_main.c index 85072548..74a07ae8 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -111,7 +111,7 @@ timeval_msec_diff(const struct timeval *start, const struct timeval *end) /* Code to wrap up old legacy test cases that used setup() and cleanup(). * * Not all of the tests designated "legacy" are ones that used setup() and - * cleanup(), of course. A test is legacy it it uses setup()/cleanup(), OR + * cleanup(), of course. A test is legacy if it uses setup()/cleanup(), OR * if it wants to find its event base/socketpair in global variables (ugh), * OR if it wants to communicate success/failure through test_ok. */ diff --git a/util-internal.h b/util-internal.h index fb3ed29c..eac987f4 100644 --- a/util-internal.h +++ b/util-internal.h @@ -75,7 +75,7 @@ extern "C" { #define inline EVENT__inline #endif -/* Define to appropriate substitute if compiler doesnt have __func__ */ +/* Define to appropriate substitute if compiler doesn't have __func__ */ #if defined(EVENT__HAVE___func__) # ifndef __func__ # define __func__ __func__ diff --git a/whatsnew-2.1.txt b/whatsnew-2.1.txt index c1f4df8f..341140a1 100644 --- a/whatsnew-2.1.txt +++ b/whatsnew-2.1.txt @@ -271,7 +271,7 @@ The event_enable_lock_debugging() function is now spelled correctly. You can still use the old "event_enable_lock_debuging" name, though, - so your old programs shouldnt' break. + so your old programs shouldn't break. There's also been some work done to try to make the debugging logs more generally useful. diff --git a/whatsnew-2.2.txt b/whatsnew-2.2.txt index dc708e1d..512dc4fa 100644 --- a/whatsnew-2.2.txt +++ b/whatsnew-2.2.txt @@ -99,7 +99,7 @@ So as you can see without openssl 16K is faster then 40K/4K, while for openssl 40K is still faster then 16K (I guess that this is due to with - openssl SSL_read() more at at time, while with plain we have some + openssl SSL_read() more at time, while with plain we have some allocations splits in evbuffer and maybe due to some buffer in openssl) 1.3. New backend for windows - wepoll