diff --git a/src/admin.c b/src/admin.c index 1d784fbf..a7d0c675 100644 --- a/src/admin.c +++ b/src/admin.c @@ -1006,7 +1006,7 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_ /* check if we found one */ if (auth == NULL) { - ICECAST_LOG_WARN("Client requested mangement for unknown role %lu", id); + ICECAST_LOG_WARN("Client requested management for unknown role %lu", id); error_id = ICECAST_ERROR_ADMIN_ROLEMGN_ROLE_NOT_FOUND; break; } diff --git a/src/buffer.h b/src/buffer.h index c2a33a62..661b2c6d 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -133,7 +133,7 @@ int buffer_push_data(buffer_t *buffer, const void *data, size_t length); */ int buffer_push_string(buffer_t *buffer, const char *string); -/* This pushes a formated string to the end of the buffer. +/* This pushes a formatted string to the end of the buffer. * Parameters: * buffer * The buffer to operate on. @@ -144,7 +144,7 @@ int buffer_push_string(buffer_t *buffer, const char *string); */ int buffer_push_printf(buffer_t *buffer, const char *format, ...); -/* This pushes a formated string to the end of the buffer using a va_list. +/* This pushes a formatted string to the end of the buffer using a va_list. * Parameters: * buffer * The buffer to operate on. diff --git a/src/client.c b/src/client.c index 2043fc2a..35687a60 100644 --- a/src/client.c +++ b/src/client.c @@ -301,7 +301,7 @@ void client_destroy(client_t *client) return; } - ICECAST_LOG_DEBUG("Called to destory client %p on connection %p (connection ID: %llu, sock=%R)", client, client->con, (long long unsigned int)client->con->id, client->con->sock); + ICECAST_LOG_DEBUG("Called to destroy client %p on connection %p (connection ID: %llu, sock=%R)", client, client->con, (long long unsigned int)client->con->id, client->con->sock); fastevent_emit(FASTEVENT_TYPE_CLIENT_DESTROY, FASTEVENT_FLAG_MODIFICATION_ALLOWED, FASTEVENT_DATATYPE_CLIENT, client); diff --git a/src/listensocket.c b/src/listensocket.c index 381dbece..fb39fb06 100644 --- a/src/listensocket.c +++ b/src/listensocket.c @@ -634,7 +634,7 @@ static int listensocket_apply_config__unlocked(listensocket_t *self thread_rwlock_wlock(&self->listener_rwlock); if (self->listener_update) { if (__listener_cmp(self->listener, self->listener_update) != 1) { - ICECAST_LOG_ERROR("Tried to apply incomplete configuration to listensocket: bind address missmatch: have %s:%i, got %s:%i", + ICECAST_LOG_ERROR("Tried to apply incomplete configuration to listensocket: bind address mismatch: have %s:%i, got %s:%i", __string_default(self->listener->bind_address, ""), self->listener->port, __string_default(self->listener_update->bind_address, ""), diff --git a/src/reportxml.c b/src/reportxml.c index b2d52f35..5e6f1b8e 100644 --- a/src/reportxml.c +++ b/src/reportxml.c @@ -1456,7 +1456,7 @@ reportxml_node_t * reportxml_database_build_fragment(reportxml_database_t * return ret; } else if (got == type) { refobject_unref(definition); - ICECAST_LOG_ERROR("Definition lists multiple childs of target type. BAD."); + ICECAST_LOG_ERROR("Definition lists multiple children of target type. BAD."); return NULL; } diff --git a/src/slave.c b/src/slave.c index f108f0c8..a5ac06a4 100644 --- a/src/slave.c +++ b/src/slave.c @@ -366,7 +366,7 @@ static client_t *open_relay_connection (relay_t *relay, relay_config_upstream_t if (client_create (&client, con, parser) < 0) { global_unlock (); - /* make sure only the client_destory frees these */ + /* make sure only the client_destroy frees these */ con = NULL; parser = NULL; client_destroy (client); diff --git a/src/util.c b/src/util.c index c92cd0ae..c7d5d9be 100644 --- a/src/util.c +++ b/src/util.c @@ -914,7 +914,7 @@ static inline int __parse_q(const char *str) } else if (*str == '.') { mul = 100; } else { - ICECAST_LOG_ERROR("Badly formated quality parameter found."); + ICECAST_LOG_ERROR("Badly formatted quality parameter found."); return -1; } }