From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 14 Feb 2025 04:16:17 +0000 (-0500) Subject: global: Fix spelling X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=351a30e80ce690fcefd458624a6c14c3aa514dca;p=thirdparty%2Fdovecot%2Fcore.git global: Fix spelling Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/m4/dovecot.m4 b/m4/dovecot.m4 index 155b7f4d26..567e6afe11 100644 --- a/m4/dovecot.m4 +++ b/m4/dovecot.m4 @@ -439,7 +439,7 @@ AC_DEFUN([DC_DOVECOT],[ AC_SUBST(abs_dovecotdir) DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs" - dnl Make sure dovecot-config doesn't accidentically override flags + dnl Make sure dovecot-config doesn't accidentally override flags ORIG_CFLAGS="$CFLAGS" ORIG_LDFLAGS="$LDFLAGS" ORIG_BINARY_CFLAGS="$BINARY_CFLAGS" diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4 index 1ce87f1a60..3a6735604f 100644 --- a/m4/want_unwind.m4 +++ b/m4/want_unwind.m4 @@ -6,7 +6,7 @@ AC_DEFUN([DOVECOT_WANT_UNWIND], [ have_libunwind=no AS_IF([test "$want_libunwind" = "yes"], [ - AC_MSG_ERROR([cannot build with libuwind support: unwind library (libunwind-generic) not found]) + AC_MSG_ERROR([cannot build with libunwind support: unwind library (libunwind-generic) not found]) ]) ]) ]) diff --git a/src/auth/passdb-cache.c b/src/auth/passdb-cache.c index 8690887b6a..560b73d16a 100644 --- a/src/auth/passdb-cache.c +++ b/src/auth/passdb-cache.c @@ -255,7 +255,7 @@ void passdb_cache_init(const struct auth_settings *set) if (restrict_get_process_size(&limit) == 0 && set->cache_size > (uoff_t)limit) { - i_warning("auth_cache_size (%"PRIuUOFF_T"M) is higher than " + i_warning("auth_cache_size (%"PRIuUOFF_T"M) is greater than " "process VSZ limit (%"PRIuUOFF_T"M)", set->cache_size/1024/1024, (uoff_t)(limit/1024/1024)); diff --git a/src/doveadm/dsync/dsync-brain-mailbox.c b/src/doveadm/dsync/dsync-brain-mailbox.c index 7c40af49f2..ae4e5dfe45 100644 --- a/src/doveadm/dsync/dsync-brain-mailbox.c +++ b/src/doveadm/dsync/dsync-brain-mailbox.c @@ -302,7 +302,7 @@ int dsync_brain_sync_mailbox_open(struct dsync_brain *brain, } if (last_common_uid != 0) { - /* if last_common_* is higher than our current ones it means + /* if last_common_* is greater than our current ones it means that the incremental sync state is stale and we need to do a full resync */ if (status.uidnext < last_common_uid) { diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c index 2a19e8416d..7db42b150e 100644 --- a/src/doveadm/dsync/dsync-mailbox-import.c +++ b/src/doveadm/dsync/dsync-mailbox-import.c @@ -1970,10 +1970,10 @@ dsync_mailbox_import_saved_newmail(struct dsync_mailbox_importer *importer, are larger than we're committing. Note that if any existing UIDs have been changed, the new UID is - usually higher than anything that is being saved so we can't do + usually greater than anything that is being saved so we can't do an intermediate commit. It's too much extra work to try to handle that situation. So here this never happens, because then - array_count(wanted_uids) is always higher than first_unsaved_idx. */ + array_count(wanted_uids) is always greater than first_unsaved_idx. */ if (importer->saves_since_commit >= importer->commit_msgs_interval && importer->first_unsaved_idx == array_count(&importer->wanted_uids)) { if (dsync_mailbox_import_commit(importer, FALSE) < 0) diff --git a/src/doveadm/test-doveadm-cmd-parse.c b/src/doveadm/test-doveadm-cmd-parse.c index 7b4869c4d1..d2429a74fd 100644 --- a/src/doveadm/test-doveadm-cmd-parse.c +++ b/src/doveadm/test-doveadm-cmd-parse.c @@ -268,7 +268,7 @@ static void test_switches(void) line("cmd -2 value2 -1 arg1")); test_case("kwswitch_after_12", 0, assert_switch12_1_pos_args, &cmdv2_switches, line("cmd arg1 -1 -2 value2")); - test_case("kwswitch_fater_21", 0, assert_switch12_1_pos_args, &cmdv2_switches, + test_case("kwswitch_after_21", 0, assert_switch12_1_pos_args, &cmdv2_switches, line("cmd arg1 -2 value2 -1")); } diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c index 9fb33355a4..d24564029d 100644 --- a/src/imap/imap-client.c +++ b/src/imap/imap-client.c @@ -1275,7 +1275,7 @@ static bool client_skip_line(struct client *client) static void client_idle_output_timeout(struct client *client) { client_destroy(client, t_strdup_printf( - "Client has not read server output for for %"PRIdTIME_T" secs", + "Client has not read server output for %"PRIdTIME_T" secs", ioloop_time - client->last_output)); } diff --git a/src/lib-auth/auth-scram-server.c b/src/lib-auth/auth-scram-server.c index 2e261b34cf..f0e9156907 100644 --- a/src/lib-auth/auth-scram-server.c +++ b/src/lib-auth/auth-scram-server.c @@ -509,7 +509,7 @@ auth_scram_parse_client_finish(struct auth_scram_server *server ATTR_UNUSED, return 0; } -bool auth_scram_server_acces_granted(struct auth_scram_server *server) +bool auth_scram_server_access_granted(struct auth_scram_server *server) { return (server->state == AUTH_SCRAM_SERVER_STATE_SERVER_FINAL); } diff --git a/src/lib-auth/auth-scram-server.h b/src/lib-auth/auth-scram-server.h index bc01038f23..3d8e357cf5 100644 --- a/src/lib-auth/auth-scram-server.h +++ b/src/lib-auth/auth-scram-server.h @@ -96,7 +96,7 @@ void auth_scram_server_init(struct auth_scram_server *server_r, pool_t pool, void auth_scram_server_deinit(struct auth_scram_server *server); /* Returns TRUE if authentication was concluded successfully. */ -bool auth_scram_server_acces_granted(struct auth_scram_server *server); +bool auth_scram_server_access_granted(struct auth_scram_server *server); /* Pass client input to the server. Returns 1 if server output is available, 0 if no server output is available yet (e.g. pending credentials lookup), and diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c index 220e7abfb9..974d08d7fc 100644 --- a/src/lib-compression/istream-zlib.c +++ b/src/lib-compression/istream-zlib.c @@ -32,7 +32,7 @@ struct zlib_istream { bool header_read:1; bool trailer_read:1; bool zs_closed:1; - bool starting_concated_output:1; + bool starting_concatenated_output:1; }; static void i_stream_zlib_init(struct zlib_istream *zstream); @@ -242,9 +242,9 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream) return -1; } /* Multiple gz streams concatenated together */ - zstream->starting_concated_output = TRUE; + zstream->starting_concatenated_output = TRUE; } - if (zstream->starting_concated_output) { + if (zstream->starting_concatenated_output) { /* make sure there actually is something in parent stream. we don't want to reset the stream unless we actually see some concatenated output. */ @@ -266,7 +266,7 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream) zstream->header_read = FALSE; zstream->trailer_read = FALSE; zstream->crc32 = 0; - zstream->starting_concated_output = FALSE; + zstream->starting_concatenated_output = FALSE; (void)inflateEnd(&zstream->zs); i_stream_zlib_init(zstream); diff --git a/src/lib-dns-client/dns-lua.h b/src/lib-dns-client/dns-lua.h index 80259ce668..68ee444157 100644 --- a/src/lib-dns-client/dns-lua.h +++ b/src/lib-dns-client/dns-lua.h @@ -7,7 +7,7 @@ struct dns_client; /* Internally, the dns methods yield via lua_yieldk() as implemented in Lua 5.3 and newer. */ -void dlua_push_dns_client(lua_State *L, struct dns_client *cliet); +void dlua_push_dns_client(lua_State *L, struct dns_client *client); struct dns_client *dlua_check_dns_client(lua_State *L, int idx); #endif diff --git a/src/lib-http/http-client-peer.c b/src/lib-http/http-client-peer.c index e6a95c9a14..74117b58cb 100644 --- a/src/lib-http/http-client-peer.c +++ b/src/lib-http/http-client-peer.c @@ -739,7 +739,7 @@ static void http_client_peer_drop(struct http_client_peer **_peer) if (http_client_peer_shared_start_backoff_timer(pshared)) { e_debug(peer->event, - "Dropping peer (waiting for backof timeout)"); + "Dropping peer (waiting for backoff timeout)"); /* Will disconnect any pending connections */ http_client_peer_trigger_request_handler(peer); diff --git a/src/lib-http/http-client.h b/src/lib-http/http-client.h index 37b70bfd29..f8d2e83349 100644 --- a/src/lib-http/http-client.h +++ b/src/lib-http/http-client.h @@ -87,8 +87,8 @@ struct http_client_settings { if > 0, the maximum will be enforced across all IPs for that host, meaning that IPs may be tried more than once eventually if the number - of IPs is smaller than the specified maximum attempts. If the number - of IPs is higher than the maximum attempts, not all IPs are tried. + of IPs is less than the specified maximum attempts. If the number + of IPs is greater than the maximum attempts, not all IPs are tried. If 0, all IPs are tried at most once. */ unsigned int max_connect_attempts; diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c index 7d3f30fa89..b0e379ac8e 100644 --- a/src/lib-index/mail-cache-transaction.c +++ b/src/lib-index/mail-cache-transaction.c @@ -48,7 +48,7 @@ struct mail_cache_transaction_ctx { bool tried_purging:1; bool decisions_refreshed:1; - bool have_noncommited_mails:1; + bool have_noncommitted_mails:1; bool changes:1; }; @@ -304,7 +304,7 @@ mail_cache_transaction_update_index(struct mail_cache_transaction_ctx *ctx, if (committing) { /* The transaction is being committed now. Use it. */ trans = ctx->trans; - } else if (ctx->have_noncommited_mails) { + } else if (ctx->have_noncommitted_mails) { /* Some of the mails haven't been committed yet. We must use the provided transaction to update the cache records. */ trans = ctx->trans; @@ -518,7 +518,7 @@ mail_cache_transaction_flush(struct mail_cache_transaction_ctx *ctx, /* If we're going to be committing a transaction, the log must be locked before we lock cache or we can deadlock. */ bool lock_log = !ctx->cache->index->log_sync_locked && - !committing && !ctx->have_noncommited_mails; + !committing && !ctx->have_noncommitted_mails; if (lock_log) { uint32_t file_seq; uoff_t file_offset; @@ -788,7 +788,7 @@ void mail_cache_add(struct mail_cache_transaction_ctx *ctx, uint32_t seq, return; if (seq >= ctx->trans->first_new_seq) - ctx->have_noncommited_mails = TRUE; + ctx->have_noncommitted_mails = TRUE; /* If the cache file exists, make sure the caching decisions have been read. */ diff --git a/src/lib-index/mail-index-map.c b/src/lib-index/mail-index-map.c index b3aeb07ffa..70e384c9c6 100644 --- a/src/lib-index/mail-index-map.c +++ b/src/lib-index/mail-index-map.c @@ -221,7 +221,7 @@ int mail_index_map_ext_hdr_check(const struct mail_index_header *hdr, return -1; } if (ext_hdr->hdr_size > MAIL_INDEX_EXT_HEADER_MAX_SIZE) { - *error_r = t_strdup_printf("Headersize too large (%u)", + *error_r = t_strdup_printf("Header size too large (%u)", ext_hdr->hdr_size); return -1; } diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h index 0190bd984a..9ffa3bad13 100644 --- a/src/lib-index/mail-index.h +++ b/src/lib-index/mail-index.h @@ -92,9 +92,9 @@ struct mail_index_header { don't even try to read it. */ uint8_t major_version; /* Minor version is increased when the file format changes in a - backwards compatible way. If the field is smaller than + backwards compatible way. If the field is less than MAIL_INDEX_MINOR_VERSION, upgrade the file format and update the - minor_version field as well. If minor_version is higher than + minor_version field as well. If minor_version is greater than MAIL_INDEX_MINOR_VERSION, leave it as it is. It likely means that a new Dovecot version is currently being upgraded to, but the file was still accessed by an old version. */ @@ -634,7 +634,7 @@ void mail_index_lookup_first(struct mail_index_view *view, void mail_index_append(struct mail_index_transaction *t, uint32_t uid, uint32_t *seq_r); /* Assign new UIDs for mails with uid=0 or uid= first_new_uid, and also higher than the highest seen uid (i.e. it + UIDs are >= first_new_uid, and also greater than the highest seen uid (i.e. it doesn't try to fill UID gaps). Assumes that mailbox is locked in a way that UIDs can be safely assigned. Returns UIDs for all assigned messages, in their sequence order (so UIDs are not necessary ascending). */ diff --git a/src/lib-json/json-parser.c b/src/lib-json/json-parser.c index c312e4182c..9eb89e285a 100644 --- a/src/lib-json/json-parser.c +++ b/src/lib-json/json-parser.c @@ -1068,7 +1068,7 @@ json_parser_do_parse_literal(struct json_parser *parser, if ((unichar_t)*p != ch) { json_parser_error( parser, "Expected value '%s', " - "but encounted '%s' + %s", + "but encountered '%s' + %s", literal, t_strdup_until(literal, p), json_parser_curchar_str(parser)); return JSON_PARSE_ERROR; @@ -1345,7 +1345,7 @@ json_parser_parse_unicode_escape(struct json_parser *parser, break; } if (ret == JSON_PARSE_NO_DATA) { - /* We already checked that 4 octets are available for for hex + /* We already checked that 4 octets are available for hex digits. The only thing that could have happened is that we encountered the beginnings of an UTF-8 character and no more input is available. Finish it at a deeper parse level that diff --git a/src/lib-json/test-json-parser.c b/src/lib-json/test-json-parser.c index f5e8f9f5f3..5c5031a143 100644 --- a/src/lib-json/test-json-parser.c +++ b/src/lib-json/test-json-parser.c @@ -2054,7 +2054,7 @@ invalid_parse_tests[] = { }, { // invalid/lone-second-surrogate/input - .input = "[\"\\uDFAA (second surrogate on it's own)\"]\n", + .input = "[\"\\uDFAA (second surrogate on its own)\"]\n", }, { // invalid/negative-integer-starting-with-zero/input diff --git a/src/lib-language/lang-settings.c b/src/lib-language/lang-settings.c index 0d21f24e3d..c5d454d284 100644 --- a/src/lib-language/lang-settings.c +++ b/src/lib-language/lang-settings.c @@ -124,7 +124,7 @@ static bool langs_settings_ext_check(struct event *event, void *_set, if (lang_default != NULL) { *error_r = t_strdup_printf( - "Only one language with with { default = yes } is allowed" + "Only one language with { default = yes } is allowed" " (default is '%s', cannot set '%s' too)", lang_default, lang_set->name); settings_free(lang_set); diff --git a/src/lib-language/lang-tokenizer-generic.c b/src/lib-language/lang-tokenizer-generic.c index fa4105a029..486f884e9a 100644 --- a/src/lib-language/lang-tokenizer-generic.c +++ b/src/lib-language/lang-tokenizer-generic.c @@ -67,7 +67,7 @@ lang_tokenizer_generic_create(const struct lang_settings *set, bool wb5a = set->tokenizer_generic_wb5a; if (wb5a && algo->id != BOUNDARY_ALGORITHM_TR29) { - *error_r = "Can not use language_tokenizer_generic_wb5a for " + *error_r = "Cannot use language_tokenizer_generic_wb5a for " "algorithms other than language_tokenizer_generic_algorithm = tr29"; return -1; } diff --git a/src/lib-language/test-lang-tokenizer.c b/src/lib-language/test-lang-tokenizer.c index da9d61b5c8..ea0051063c 100644 --- a/src/lib-language/test-lang-tokenizer.c +++ b/src/lib-language/test-lang-tokenizer.c @@ -38,10 +38,10 @@ static void init_lang_settings(void) "foo, foo@domain " \ "abcdefghijklmnopqrstuvxyz.abcdefghijklmnopqrstuvxyzabcdefghijklmnopqrstuvxyz@1bcdefghijklmnopqrstuvxy1.2bcdefghijklmnopqrstuvxy2.3bcdefghijklmnopqrstuvxy3.4bcdefghijklmnopqrstuvxy4.5bcdefghijklmnopqrstuvxy5.6bcdefghijklmnopqrstuvxy6.7bcdefghijklmnopqrstuvxy7.8bcdefghijklmnopqrstuvxy8.9bcdefghijklmnopqrstuvxy9.0bcdefghijklmnopqrstuvxy0.tld " \ "trailing, period@blue.com. " \ - "multi-trialing, mul@trail.com..... " \ + "multi-trailing, mul@trail.com..... " \ "m@s " \ - "hypen@hypen-hypen.com " \ - "hypen@hypen-hypen-sick.com.-" + "hyphen@hyphen-hyphen.com " \ + "hyphen@hyphen-hyphen-sick.com.-" static const char *test_inputs[] = { /* generic things and word truncation: */ @@ -339,8 +339,8 @@ static void test_lang_tokenizer_address_only(void) "period@blue.com", /*trailing period '.' in email */ "mul@trail.com", "m@s", /*one letter local-part and domain name */ - "hypen@hypen-hypen.com", - "hypen@hypen-hypen-sick.com", + "hyphen@hyphen-hyphen.com", + "hyphen@hyphen-hyphen-sick.com", NULL }; struct lang_tokenizer *tok; @@ -373,10 +373,10 @@ static void test_lang_tokenizer_address_parent(const char *name, struct lang_set "9bcdefghijklmnopqrstuvxy9", "0bcdefghijklmnopqrstuvxy0", "tld", "trailing", "period", "blue", "com", "period@blue.com", - "multi", "trialing", "mul", "trail", "com", "mul@trail.com", + "multi", "trailing", "mul", "trail", "com", "mul@trail.com", "m", "m@s", "s", - "hypen", "hypen", "hypen", "hypen@hypen-hypen.com", "com", - "hypen", "hypen", "hypen", "sick", "com", "hypen@hypen-hypen-sick.com", + "hyphen", "hyphen", "hyphen", "hyphen@hyphen-hyphen.com", "com", + "hyphen", "hyphen", "hyphen", "sick", "com", "hyphen@hyphen-hyphen-sick.com", NULL }; struct lang_tokenizer *tok, *gen_tok; @@ -421,10 +421,10 @@ static void test_lang_tokenizer_address_search(void) "9bcdefghijklmnopqrstuvxy9", "0bcdefghijklmnopqrstuvxy0", "tld", "trailing", "period@blue.com", - "multi", "trialing", "mul@trail.com", + "multi", "trailing", "mul@trail.com", "m@s", - "hypen@hypen-hypen.com", - "hypen@hypen-hypen-sick.com", + "hyphen@hyphen-hyphen.com", + "hyphen@hyphen-hyphen-sick.com", NULL }; struct lang_tokenizer *tok, *gen_tok; diff --git a/src/lib-lua/dlua-dovecot-http.c b/src/lib-lua/dlua-dovecot-http.c index 38e0de648b..84c60f8477 100644 --- a/src/lib-lua/dlua-dovecot-http.c +++ b/src/lib-lua/dlua-dovecot-http.c @@ -116,7 +116,7 @@ static int dlua_http_request_submit(lua_State *L) submitted. */ lua_getfield(L, -1, "item"); if (lua_getmetatable(L, -1) != 1) - return luaL_error(L, "Cound't get metatable for the request"); + return luaL_error(L, "Couldn't get metatable for the request"); lua_pushnil(L); lua_setfield(L, -2, "__gc"); lua_pop(L, 2); diff --git a/src/lib-lua/dlua-resume.c b/src/lib-lua/dlua-resume.c index 8711be1162..b74197d2b6 100644 --- a/src/lib-lua/dlua-resume.c +++ b/src/lib-lua/dlua-resume.c @@ -39,7 +39,7 @@ static void queue_resume_callback(lua_State *L, int status) if (status != LUA_OK) { int ret; - /* error occured: run debug.traceback() */ + /* error occurred: run debug.traceback() */ /* stack: ..., error (top) */ lua_getglobal(L, "debug"); diff --git a/src/lib-mail/message-decoder.c b/src/lib-mail/message-decoder.c index f8fb04d0cb..55b9aa736c 100644 --- a/src/lib-mail/message-decoder.c +++ b/src/lib-mail/message-decoder.c @@ -95,7 +95,7 @@ enum message_cte message_decoder_parse_cte(const struct message_header_line *hdr rfc822_skip_lwsp(&parser); - /* Ensure we do not accidentically accept confused values like + /* Ensure we do not accidentally accept confused values like 'base64 binary' or embedded NULs */ if (rfc822_parse_mime_token(&parser, value) == 1) { rfc822_skip_lwsp(&parser); diff --git a/src/lib-mail/message-part.h b/src/lib-mail/message-part.h index 4130536205..6a442a65c5 100644 --- a/src/lib-mail/message-part.h +++ b/src/lib-mail/message-part.h @@ -68,7 +68,7 @@ bool message_part_is_equal(const struct message_part *p1, const struct message_part *p2) ATTR_NULL(1, 2); /* Same as message_part_is_equal(), but it allows to invoke an additional - comparator on each incountered part */ + comparator on each encountered part */ bool message_part_is_equal_ex(const struct message_part *p1, const struct message_part *p2, message_part_comparator_t *equals_ex) ATTR_NULL(1, 2, 3); diff --git a/src/lib-master/master-service-haproxy.c b/src/lib-master/master-service-haproxy.c index 94272724d5..1633320d28 100644 --- a/src/lib-master/master-service-haproxy.c +++ b/src/lib-master/master-service-haproxy.c @@ -622,7 +622,7 @@ master_service_haproxy_read(struct master_service_haproxy_conn *hpconn) if (*fields != NULL) { e_error(hpconn->event, "Client disconnected: " - "Header line has spurius extra field " + "Header line has spurious extra field " "(field=`%s', rip=%s)", str_sanitize(*fields, 64), net_ip2addr(real_remote_ip)); return -1; diff --git a/src/lib-master/service-settings.h b/src/lib-master/service-settings.h index 9143c59dcb..2de5a40aa1 100644 --- a/src/lib-master/service-settings.h +++ b/src/lib-master/service-settings.h @@ -89,7 +89,7 @@ struct service_settings { /* -- flags that can be set internally -- */ - /* process_limit must not be higher than 1 */ + /* process_limit must not be greater than 1 */ bool process_limit_1:1; }; ARRAY_DEFINE_TYPE(service_settings, struct service_settings *); diff --git a/src/lib-sasl/dsasl-client-mech-scram.c b/src/lib-sasl/dsasl-client-mech-scram.c index 6024042661..8b67ad1e09 100644 --- a/src/lib-sasl/dsasl-client-mech-scram.c +++ b/src/lib-sasl/dsasl-client-mech-scram.c @@ -27,7 +27,7 @@ mech_scram_init_channel_binding(struct scram_dsasl_client *sclient, else type = SSL_CHANNEL_BIND_TYPE_TLS_UNIQUE; - if (dasl_client_get_channel_binding(client, type, + if (dsasl_client_get_channel_binding(client, type, &cbind_data, error_r) < 0) return -1; diff --git a/src/lib-sasl/dsasl-client-private.h b/src/lib-sasl/dsasl-client-private.h index a1ddbce1cc..3d78b53b49 100644 --- a/src/lib-sasl/dsasl-client-private.h +++ b/src/lib-sasl/dsasl-client-private.h @@ -61,9 +61,9 @@ void dsasl_client_mech_register(const struct dsasl_client_mech *mech); void dsasl_client_mech_unregister(const struct dsasl_client_mech *mech); static inline int -dasl_client_get_channel_binding(struct dsasl_client *client, - const char *type, const buffer_t **data_r, - const char **error_r) +dsasl_client_get_channel_binding(struct dsasl_client *client, + const char *type, const buffer_t **data_r, + const char **error_r) { if (client->channel_version == SSL_IOSTREAM_PROTOCOL_VERSION_UNKNOWN || client->cbinding_callback == NULL) { diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c index c7fef9fe52..306203a40b 100644 --- a/src/lib-settings/settings.c +++ b/src/lib-settings/settings.c @@ -2175,7 +2175,7 @@ settings_instance_override_add_default(struct settings_apply_ctx *ctx, pool_ref(set->pool); if (event_filter_parse_case_sensitive(filter_string, set->filter, &error) < 0) { - i_panic("BUG: Failed to create event filter filter for %s: %s (%s)", + i_panic("BUG: Failed to create event filter for %s: %s (%s)", set->orig_key, error, filter_string); } if (array_set->filter != EVENT_FILTER_MATCH_ALWAYS) { diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c index 20e4cdbf0d..6320057bd0 100644 --- a/src/lib-smtp/smtp-client-command.c +++ b/src/lib-smtp/smtp-client-command.c @@ -710,7 +710,7 @@ smtp_client_command_pipeline_is_open(struct smtp_client_connection *conn) return TRUE; } -static void smtp_cient_command_wait(struct smtp_client_command *cmd) +static void smtp_client_command_wait(struct smtp_client_command *cmd) { struct smtp_client_connection *conn = cmd->conn; @@ -749,7 +749,7 @@ static int smtp_client_command_do_send_more(struct smtp_client_connection *conn) return ret; /* Command line sent. move command to wait list. */ - smtp_cient_command_wait(cmd); + smtp_client_command_wait(cmd); cmd->state = SMTP_CLIENT_COMMAND_STATE_WAITING; } diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c index bb62eb6254..74e536c041 100644 --- a/src/lib-smtp/smtp-client-transaction.c +++ b/src/lib-smtp/smtp-client-transaction.c @@ -969,7 +969,7 @@ smtp_client_transaction_connection_ready(struct smtp_client_transaction *trans) if (trans->state != SMTP_CLIENT_TRANSACTION_STATE_PENDING) return; - e_debug(trans->event, "Connecton is ready for transaction"); + e_debug(trans->event, "Connection is ready for transaction"); trans->state = SMTP_CLIENT_TRANSACTION_STATE_MAIL_FROM; diff --git a/src/lib-smtp/test-smtp-address.c b/src/lib-smtp/test-smtp-address.c index 857c03a56c..c0bc7140b5 100644 --- a/src/lib-smtp/test-smtp-address.c +++ b/src/lib-smtp/test-smtp-address.c @@ -1163,7 +1163,7 @@ address_detail_parse_tests[] = { "address:another+delim", '-' }, }; -unsigned int addresss_detail_parse_test_count = +unsigned int address_detail_parse_test_count = N_ELEMENTS(address_detail_parse_tests); static void test_smtp_address_detail_parse(void) @@ -1171,7 +1171,7 @@ static void test_smtp_address_detail_parse(void) unsigned int i; - for (i = 0; i < N_ELEMENTS(address_detail_parse_tests); i++) T_BEGIN { + for (i = 0; i < address_detail_parse_test_count; i++) T_BEGIN { const struct address_detail_parse_test *test = &address_detail_parse_tests[i]; struct smtp_address *address; diff --git a/src/lib-smtp/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c index a146c39881..3bd4d9be6d 100644 --- a/src/lib-smtp/test-smtp-submit.c +++ b/src/lib-smtp/test-smtp-submit.c @@ -1151,7 +1151,7 @@ static void test_data_disconnect(void) /* server */ -enum _data_timout_state { +enum _data_timeout_state { DATA_TIMEOUT_STATE_EHLO = 0, DATA_TIMEOUT_STATE_MAIL_FROM, DATA_TIMEOUT_STATE_RCPT_TO, @@ -1159,20 +1159,20 @@ enum _data_timout_state { DATA_TIMEOUT_STATE_FINISH }; -struct _data_timout_server { - enum _data_timout_state state; +struct _data_timeout_server { + enum _data_timeout_state state; }; -static void test_data_timout_input(struct server_connection *conn) +static void test_data_timeout_input(struct server_connection *conn) { - struct _data_timout_server *ctx; + struct _data_timeout_server *ctx; const char *line; if (conn->context == NULL) { - ctx = p_new(conn->pool, struct _data_timout_server, 1); + ctx = p_new(conn->pool, struct _data_timeout_server, 1); conn->context = (void*)ctx; } else { - ctx = (struct _data_timout_server *)conn->context; + ctx = (struct _data_timeout_server *)conn->context; } for (;;) { @@ -1218,24 +1218,24 @@ static void test_data_timout_input(struct server_connection *conn) } } -static void test_data_timout_init(struct server_connection *conn) +static void test_data_timeout_init(struct server_connection *conn) { o_stream_nsend_str( conn->conn.output, "220 testserver ESMTP Testfix (Debian/GNU)\r\n"); } -static void test_server_data_timout(unsigned int index) +static void test_server_data_timeout(unsigned int index) { - test_server_init = test_data_timout_init; - test_server_input = test_data_timout_input; + test_server_init = test_data_timeout_init; + test_server_input = test_data_timeout_input; test_server_run(index); } /* client */ static bool -test_client_data_timout(const struct smtp_submit_settings *submit_set) +test_client_data_timeout(const struct smtp_submit_settings *submit_set) { time_t time; const char *error = NULL; @@ -1265,8 +1265,8 @@ static void test_data_timeout(void) test_begin("data timeout"); test_expect_errors(1); test_run_client_server(&smtp_submit_set, - test_client_data_timout, - test_server_data_timout, 1); + test_client_data_timeout, + test_server_data_timeout, 1); test_end(); } diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index 390e0cdd9c..a8d7d508ff 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -1406,7 +1406,7 @@ driver_cassandra_error_is_uncertain(CassError error) case CASS_ERROR_LIB_REQUEST_TIMED_OUT: /* A request sent from the driver has timed out. */ case CASS_ERROR_LIB_WRITE_ERROR: - /* A write error occured. */ + /* A write error occurred. */ return SQL_RESULT_ERROR_TYPE_WRITE_UNCERTAIN; default: return SQL_RESULT_ERROR_TYPE_UNKNOWN; diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c index a1d8602ff8..7d2066d838 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c +++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c @@ -915,7 +915,7 @@ static bool mdbox_mailbox_is_fscked(struct mailbox *box) static int mdbox_storage_rebuild_scan_prepare(struct mdbox_storage_rebuild_context *ctx, - struct mailbox *fsckd_box, + struct mailbox *fscked_box, enum mdbox_rebuild_reason reason, const char **reason_string_r) { @@ -946,9 +946,9 @@ mdbox_storage_rebuild_scan_prepare(struct mdbox_storage_rebuild_context *ctx, mdbox_map_is_fscked(ctx->storage->map)) *reason_string_r = "dovecot.index.map was fsck'd"; else if ((reason & MDBOX_REBUILD_REASON_MAILBOX_FSCKD) != 0 && - mdbox_mailbox_is_fscked(fsckd_box)) { + mdbox_mailbox_is_fscked(fscked_box)) { *reason_string_r = t_strdup_printf( - "Mailbox %s index was fsck'd", fsckd_box->vname); + "Mailbox %s index was fsck'd", fscked_box->vname); } else { /* storage was already rebuilt by someone else */ return 0; @@ -1001,7 +1001,7 @@ static int mdbox_storage_rebuild_scan(struct mdbox_storage_rebuild_context *ctx, static int mdbox_storage_rebuild_in_context(struct mdbox_storage *storage, struct mdbox_map_atomic_context *atomic, - struct mailbox *fsckd_box, + struct mailbox *fscked_box, enum mdbox_rebuild_reason rebuild_reason) { struct mdbox_storage_rebuild_context *ctx; @@ -1017,7 +1017,7 @@ mdbox_storage_rebuild_in_context(struct mdbox_storage *storage, } ctx = mdbox_storage_rebuild_init(storage, atomic); - if ((ret = mdbox_storage_rebuild_scan_prepare(ctx, fsckd_box, + if ((ret = mdbox_storage_rebuild_scan_prepare(ctx, fscked_box, rebuild_reason, &reason_string)) > 0) { struct event_reason *reason = event_reason_begin("mdbox:rebuild"); @@ -1034,7 +1034,7 @@ mdbox_storage_rebuild_in_context(struct mdbox_storage *storage, } int mdbox_storage_rebuild(struct mdbox_storage *storage, - struct mailbox *fsckd_box, + struct mailbox *fscked_box, enum mdbox_rebuild_reason reason) { struct mdbox_map_atomic_context *atomic; @@ -1042,7 +1042,7 @@ int mdbox_storage_rebuild(struct mdbox_storage *storage, atomic = mdbox_map_atomic_begin(storage->map); ret = mdbox_storage_rebuild_in_context(storage, atomic, - fsckd_box, reason); + fscked_box, reason); mdbox_map_atomic_set_success(atomic); mdbox_map_atomic_unset_fscked(atomic); (void)mail_index_reset_fscked(storage->map->index); diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h index 6e2c488811..dcf7d88bb4 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h +++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.h @@ -13,7 +13,7 @@ enum mdbox_rebuild_reason { }; int mdbox_storage_rebuild(struct mdbox_storage *storage, - struct mailbox *fsckd_box, + struct mailbox *fscked_box, enum mdbox_rebuild_reason reason); #endif diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c index 3da2b36c17..66535994f6 100644 --- a/src/lib-storage/mailbox-list.c +++ b/src/lib-storage/mailbox-list.c @@ -280,7 +280,7 @@ mailbox_list_vname_prepare(struct mailbox_list *list, const char **_vname, if (strcasecmp(vname, "INBOX") == 0 && (list->ns->flags & NAMESPACE_FLAG_INBOX_USER) != 0) { - /* INBOX is case sensitive. Normalize it into "INBOX". */ + /* INBOX is case-sensitive. Normalize it into "INBOX". */ vname = "INBOX"; } else if (ns->prefix_len > 0) { /* skip namespace prefix, except if this is INBOX */ diff --git a/src/lib-storage/test-mailbox-list.c b/src/lib-storage/test-mailbox-list.c index a4f2ce88bd..e9d1dcca91 100644 --- a/src/lib-storage/test-mailbox-list.c +++ b/src/lib-storage/test-mailbox-list.c @@ -265,7 +265,7 @@ test_mailbox_list_get_hierarchy_sep(struct mailbox_list *list ATTR_UNUSED) } static void -test_maibox_list_name_init(struct mailbox_list *list, +test_mailbox_list_name_init(struct mailbox_list *list, const struct test_mailbox_list_name *test, bool mutf7) { @@ -483,7 +483,7 @@ static void test_mailbox_list_get_names(void) test_begin("mailbox list get names"); for (unsigned int i = 0; i < N_ELEMENTS(tests); i++) { if ((tests[i].flags & TEST_FLAG_NO_MUTF7) == 0) { - test_maibox_list_name_init(&list, &tests[i], TRUE); + test_mailbox_list_name_init(&list, &tests[i], TRUE); if ((tests[i].flags & TEST_FLAG_NO_STORAGE_NAME) == 0) { test_assert_strcmp_idx(mailbox_list_default_get_storage_name(&list, tests[i].vname), tests[i].storage_name, i); @@ -494,7 +494,7 @@ static void test_mailbox_list_get_names(void) } } if ((tests[i].flags & TEST_FLAG_NO_UTF8) == 0) { - test_maibox_list_name_init(&list, &tests[i], FALSE); + test_mailbox_list_name_init(&list, &tests[i], FALSE); if ((tests[i].flags & TEST_FLAG_NO_STORAGE_NAME) == 0) { test_assert_strcmp_idx(mailbox_list_default_get_storage_name(&list, tests[i].vname), tests[i].storage_name, i); diff --git a/src/lib-var-expand/test-var-expand.c b/src/lib-var-expand/test-var-expand.c index 86730f63e8..b9094004e4 100644 --- a/src/lib-var-expand/test-var-expand.c +++ b/src/lib-var-expand/test-var-expand.c @@ -94,7 +94,7 @@ static void run_var_expand_tests(const struct var_expand_params *params, } static void test_var_expand_builtin_filters(void) { - test_begin("var_expand(buildin filters)"); + test_begin("var_expand(builtin filters)"); const struct var_expand_table table[] = { { .key = "first", .value = "hello", }, diff --git a/src/lib/file-dotlock.c b/src/lib/file-dotlock.c index 3d4bf9910a..33ecbbfcbe 100644 --- a/src/lib/file-dotlock.c +++ b/src/lib/file-dotlock.c @@ -144,8 +144,8 @@ update_change_info(const struct stat *st, struct file_change_info *change, if (change->ctime == 0) { /* First check, set last_change to file's change time. - Use mtime instead if it's higher, but only if it's - not higher than current time, because the mtime + Use mtime instead if it's greater, but only if it's + not greater than current time, because the mtime can also be used for keeping metadata. */ change_time = st->st_mtime <= now && (st->st_mtime > st->st_ctime || !check_ctime) ? diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c index 2485eec28c..3d28c75975 100644 --- a/src/lib/ioloop.c +++ b/src/lib/ioloop.c @@ -432,7 +432,7 @@ timeout_reset_timeval(struct timeout *timeout, struct timeval *tv_now) /* If we came here from io_loop_handle_timeouts_real(), next_run must be larger than tv_now or it can go to infinite loop. This would mainly happen with 0 ms timeouts. Avoid this by making sure - next_run is at least 1 us higher than tv_now. + next_run is at least 1 us greater than tv_now. Note that some callers (like master process's process_min_avail preforking timeout) really do want the 0 ms timeout to trigger diff --git a/src/lib/lib-event.h b/src/lib/lib-event.h index 6fc9251ef5..626484e046 100644 --- a/src/lib/lib-event.h +++ b/src/lib/lib-event.h @@ -138,7 +138,7 @@ struct event *event_flatten(struct event *src); and categories to avoid sending one-off parent events. (There is a more detailed description in a comment above the function implementation.) A new reference to the source event is returned if no simplification - occured. Event pointers are dropped if a new event was created. */ + occurred. Event pointers are dropped if a new event was created. */ struct event *event_minimize(struct event *src); /* Copy all categories from source to dest. Only the categories in source event itself are copied. @@ -265,7 +265,7 @@ struct event *event_replace_log_prefix(struct event *event, const char *prefix); /* Drop count prefixes from parents when this event is used for logging. This does not affect the parent events. This only counts actual prefixes and not - parents. If the count is higher than the actual number of prefixes added by + parents. If the count is greater than the actual number of prefixes added by parents, all will be dropped. */ struct event * event_drop_parent_log_prefixes(struct event *event, unsigned int count); diff --git a/src/master/master-settings.c b/src/master/master-settings.c index 7a2bb5fa3b..3803a4f27e 100644 --- a/src/master/master-settings.c +++ b/src/master/master-settings.c @@ -739,32 +739,32 @@ master_settings_ext_check(struct event *event, void *_set, process_limit = service->process_limit; if (process_limit == 0) { *error_r = t_strdup_printf("service(%s): " - "process_limit must be higher than 0", + "process_limit must be greater than 0", service->name); return FALSE; } if (service->process_min_avail > process_limit) { *error_r = t_strdup_printf("service(%s): " - "process_min_avail is higher than process_limit", + "process_min_avail is greater than process_limit", service->name); return FALSE; } if (service->client_limit == 0) { *error_r = t_strdup_printf("service(%s): " - "client_limit must be higher than 0", + "client_limit must be greater than 0", service->name); return FALSE; } if (service->restart_request_count == 0) { *error_r = t_strdup_printf("service(%s): " - "restart_request_count must be higher than 0 " + "restart_request_count must be greater than 0 " "(did you mean \"unlimited\"?)", service->name); return FALSE; } if (service->idle_kill_interval == 0) { *error_r = t_strdup_printf("service(%s): " - "idle_kill_interval must be higher than 0 " + "idle_kill_interval must be greater than 0 " "(did you mean \"unlimited\"?)", service->name); return FALSE; diff --git a/src/plugins/acl/acl-backend-vfile-update.c b/src/plugins/acl/acl-backend-vfile-update.c index c73fc19d07..8e008a2d4c 100644 --- a/src/plugins/acl/acl-backend-vfile-update.c +++ b/src/plugins/acl/acl-backend-vfile-update.c @@ -243,8 +243,8 @@ int acl_backend_vfile_object_update(struct acl_object *_aclobj, return -1; } if (orig_mtime < update->last_change && update->last_change != 0) { - /* set mtime to last_change, if it's higher than the file's - original mtime. if original mtime is higher, then we're + /* set mtime to last_change, if it's greater than the file's + original mtime. if original mtime is greater, then we're merging some changes and it's better for the mtime to get updated. */ ut.actime = ioloop_time; diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c index 7db6ff5e8a..ecc1509e45 100644 --- a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c +++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c @@ -502,7 +502,7 @@ fts_backend_flatcurve_rescan_box(struct flatcurve_fts_backend *backend, u2, u); } else { e_debug(e->add_str("status", "expunge_msgs")->event(), - "Rescan: expunge non-existent messages " + "Rescan: expunge nonexistent messages " "expunged=%s", u); } } T_END; diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c index d0631c4ef8..955d170a60 100644 --- a/src/plugins/quota/quota-imapc.c +++ b/src/plugins/quota/quota-imapc.c @@ -282,7 +282,7 @@ imapc_quota_refresh_update(struct quota *quota, root->bytes_last = refresh_root->bytes_cur; root->count_last = refresh_root->count_cur; - /* If limits are higher than what dovecot can handle + /* If limits are greater than what dovecot can handle consider them unlimited. */ if (refresh_root->bytes_limit > INT64_MAX) root->root.bytes_limit = 0; diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c index 42ea233cf3..c3a1a819b5 100644 --- a/src/pop3/pop3-client.c +++ b/src/pop3/pop3-client.c @@ -78,7 +78,7 @@ static void client_idle_timeout(struct client *client) { if (client->cmd != NULL) { client_destroy(client, t_strdup_printf( - "Client has not read server output for for %"PRIdTIME_T" secs", + "Client has not read server output for %"PRIdTIME_T" secs", ioloop_time - client->last_output)); } else { client_send_line(client, "-ERR Disconnected for inactivity."); diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c index 0dfb5c81fc..9926813b35 100644 --- a/src/stats/stats-metrics.c +++ b/src/stats/stats-metrics.c @@ -146,7 +146,7 @@ static int stats_metrics_add_set(struct stats_metrics *metrics, exporter = stats_metrics_exporter_find(metrics, set->exporter); if (exporter == NULL) { *error_r = t_strdup_printf("metric %s refers to " - "non-existent exporter '%s'", + "nonexistent exporter '%s'", set->name, set->exporter); return -1; diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c index 456c579f2d..55ae767b6c 100644 --- a/src/stats/stats-settings.c +++ b/src/stats/stats-settings.c @@ -608,7 +608,7 @@ stats_settings_ext_check(struct event *event, void *_set, } if (ret == 0) { *error_r = t_strdup_printf("metric %s refers to " - "non-existent exporter '%s'", + "nonexistent exporter '%s'", metric_name, metric_exporter); return FALSE; diff --git a/src/stats/test-stats-metrics.c b/src/stats/test-stats-metrics.c index 6f00741215..2ed1616833 100644 --- a/src/stats/test-stats-metrics.c +++ b/src/stats/test-stats-metrics.c @@ -160,7 +160,7 @@ static const struct discrete_test discrete_tests[] = { "metric/test/group_by/sub_name/method/discrete/method=discrete", NULL }, 3, - { "apple", "bannana", "orange", }, + { "apple", "banana", "orange", }, { "pie", "yoghurt", "cobbler", }, }, {