summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--buffer.c2
-rw-r--r--buffer_iocp.c2
-rw-r--r--bufferevent_ratelim.c2
-rw-r--r--configure.ac2
-rw-r--r--include/event2/http_struct.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 28bab0a4..ce2875b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@
*.exe
*.lib
-# Patch leaves these lying arround
+# Patch leaves these lying around
*.orig
*.rej
diff --git a/buffer.c b/buffer.c
index 6c96f054..fcbcba3c 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1668,7 +1668,7 @@ evbuffer_search_eol(struct evbuffer *buffer,
if (evbuffer_strchr(&it, '\n') < 0)
goto done;
extra_drain = 1;
- /* ... optionally preceeded by a CR. */
+ /* ... optionally preceded by a CR. */
if (it.pos == start_pos)
break; /* If the first character is \n, don't back up */
/* This potentially does an extra linear walk over the first
diff --git a/buffer_iocp.c b/buffer_iocp.c
index 2af0c49c..77619760 100644
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@@ -69,7 +69,7 @@ struct evbuffer_overlapped {
WSABUF buffers[MAX_WSABUFS];
};
-/** Given an evbuffer, return the correponding evbuffer structure, or NULL if
+/** Given an evbuffer, return the corresponding evbuffer structure, or NULL if
* the evbuffer isn't overlapped. */
static inline struct evbuffer_overlapped *
upcast_evbuffer(struct evbuffer *buf)
diff --git a/bufferevent_ratelim.c b/bufferevent_ratelim.c
index 3b7ae51b..1fed9d15 100644
--- a/bufferevent_ratelim.c
+++ b/bufferevent_ratelim.c
@@ -76,7 +76,7 @@ ev_token_bucket_update_(struct ev_token_bucket *bucket,
ev_uint32_t current_tick)
{
/* It's okay if the tick number overflows, since we'll just
- * wrap around when we do the unsigned substraction. */
+ * wrap around when we do the unsigned subtraction. */
unsigned n_ticks = current_tick - bucket->last_updated;
/* Make sure some ticks actually happened, and that time didn't
diff --git a/configure.ac b/configure.ac
index b91c5878..b73ac424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -766,7 +766,7 @@ if test "$enable_gcc_warnings" != "no" && test "$GCC" = "yes"; then
AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"])
fi
- dnl Disable warnings for unused paramaters
+ dnl Disable warnings for unused parameters
AX_CHECK_COMPILE_FLAG([-Wno-unused-parameter], [CFLAGS="$CFLAGS -Wno-unused-parameter"],[],[-Werror])
AX_CHECK_COMPILE_FLAG([-Wno-void-pointer-to-enum-cast], [CFLAGS="$CFLAGS -Wno-void-pointer-to-enum-cast"],[],[-Werror])
diff --git a/include/event2/http_struct.h b/include/event2/http_struct.h
index 4bf5b1ff..b828180e 100644
--- a/include/event2/http_struct.h
+++ b/include/event2/http_struct.h
@@ -129,7 +129,7 @@ struct {
int (*header_cb)(struct evhttp_request *, void *);
/*
- * Error callback - called when error is occured.
+ * Error callback - called when error is occurred.
* @see evhttp_request_error for error types.
*
* @see evhttp_request_set_error_cb()