From: Aki Tuomi Date: Wed, 1 Nov 2017 17:07:26 +0000 (+0200) Subject: global: Fix spelling mistakes in comments X-Git-Tag: 2.3.0.rc1~614 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19557f192d37cd54a1a090a8a26d9d47265e4413;p=thirdparty%2Fdovecot%2Fcore.git global: Fix spelling mistakes in comments Original work by @andreasschulze and @jsoref --- diff --git a/doc/example-config/conf.d/20-pop3.conf b/doc/example-config/conf.d/20-pop3.conf index e0ba55229f..7b310eaa8d 100644 --- a/doc/example-config/conf.d/20-pop3.conf +++ b/doc/example-config/conf.d/20-pop3.conf @@ -37,7 +37,7 @@ # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u diff --git a/doc/example-config/conf.d/90-quota.conf b/doc/example-config/conf.d/90-quota.conf index 40cde638b4..3308c05950 100644 --- a/doc/example-config/conf.d/90-quota.conf +++ b/doc/example-config/conf.d/90-quota.conf @@ -33,7 +33,7 @@ plugin { # You can execute a given command when user exceeds a specified quota limit. # Each quota root has separate limits. Only the command for the first -# exceeded limit is excecuted, so put the highest limit first. +# exceeded limit is executed, so put the highest limit first. # The commands are executed via script service by connecting to the named # UNIX socket (quota-warning below). # Note that % needs to be escaped as %%, otherwise "% " expands to empty. diff --git a/m4/notify.m4 b/m4/notify.m4 index 600612b6ec..e4da4b965a 100644 --- a/m4/notify.m4 +++ b/m4/notify.m4 @@ -25,7 +25,7 @@ AC_DEFUN([DOVECOT_NOTIFY], [ have_notify=kqueue notify=kqueue AC_MSG_RESULT("yes") - AC_DEFINE(IOLOOP_NOTIFY_KQUEUE,, [Use BSD kqueue directory changes notificaton]) + AC_DEFINE(IOLOOP_NOTIFY_KQUEUE,, [Use BSD kqueue directory changes notification]) else AC_MSG_RESULT("no") if test "$notify" = "kqueue" ; then diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c index 87c5bdefbd..46b0caa4c0 100644 --- a/src/auth/auth-request-handler.c +++ b/src/auth/auth-request-handler.c @@ -841,7 +841,7 @@ void auth_request_handler_flush_failures(bool flush_all) for (i = 0; i < count; i++) { auth_request = auth_requests[aqueue_idx(auth_failures, i)]; - /* FIXME: assumess that failure_delay is always the same. */ + /* FIXME: assumes that failure_delay is always the same. */ diff = ioloop_time - auth_request->last_access; if (diff < (time_t)auth_request->set->failure_delay && !flush_all) diff --git a/src/auth/db-checkpassword.c b/src/auth/db-checkpassword.c index 9d89a9d787..5b5cfe91c7 100644 --- a/src/auth/db-checkpassword.c +++ b/src/auth/db-checkpassword.c @@ -129,7 +129,7 @@ checkpassword_request_finish_auth(struct chkpw_auth_request *request) /* standard checkpassword exit codes: */ case 1: /* (1 is additionally defined in vpopmail for - "pop/smtp/webmal/ imap/access denied") */ + "pop/smtp/webmail/ imap/access denied") */ auth_request_log_info(request->request, AUTH_SUBSYS_DB, "Login failed (status=%d)", request->exit_status); diff --git a/src/auth/db-passwd-file.c b/src/auth/db-passwd-file.c index ff6bebfc80..97c4888185 100644 --- a/src/auth/db-passwd-file.c +++ b/src/auth/db-passwd-file.c @@ -49,7 +49,7 @@ passwd_file_add(struct passwd_file *pw, const char *username, pass[len-1] == ']' && pass[len-4] == '[') { /* password[type] - we're being libpam-pwdfile compatible here. it uses 13 = DES and 34 = MD5. For backwards - comaptibility with ourself, we have also 56 = Digest-MD5. */ + compatibility with ourself, we have also 56 = Digest-MD5. */ int num = (pass[len-3] - '0') * 10 + (pass[len-2] - '0'); pass = t_strndup(pass, len-4); diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c index acf1e9bc22..2d8182e5ca 100644 --- a/src/auth/mech-gssapi.c +++ b/src/auth/mech-gssapi.c @@ -632,7 +632,7 @@ mech_gssapi_unwrap(struct gssapi_auth_request *request, gss_buffer_desc inbuf) /* Set username early, so that the credential lookup is for the * authorizing user. This means the username in subsequent log - * messagess will be the authorization name, not the authentication + * messages will be the authorization name, not the authentication * name, which may mean that future log messages should be adjusted * to log the right thing. */ if (!auth_request_set_username(auth_request, login_user, &error)) { diff --git a/src/config/config-parser.c b/src/config/config-parser.c index be0f6c7d6e..f7caba191a 100644 --- a/src/config/config-parser.c +++ b/src/config/config-parser.c @@ -549,7 +549,7 @@ settings_include(struct config_parser_context *ctx, const char *pattern, return -1; } - /* iterate throuth the different files matching the globbing */ + /* iterate through the different files matching the globbing */ for (i = globbers.gl_pathc; i > 0; i--) { if (settings_add_include(ctx, globbers.gl_pathv[i-1], ignore_errors, &error) < 0) { diff --git a/src/director/director-connection.c b/src/director/director-connection.c index 128f297987..a605990856 100644 --- a/src/director/director-connection.c +++ b/src/director/director-connection.c @@ -778,7 +778,7 @@ static bool director_cmd_director(struct director_connection *conn, } /* just forward this to the entire ring until it reaches back to itself. some hosts may see this twice, but that's the only way to - guarantee that it gets seen by everyone. reseting the host multiple + guarantee that it gets seen by everyone. resetting the host multiple times may cause us to handle its commands multiple times, but the commands can handle that. however, we need to also handle a situation where the added director never comes back - we don't want diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c index 0d800f2ee7..5ef31ef5d7 100644 --- a/src/imap-urlauth/imap-urlauth.c +++ b/src/imap-urlauth/imap-urlauth.c @@ -6,7 +6,7 @@ user A has an URLAUTH that references a mail from user B, it makes a connection to the imap-urlauth service to access user B's mail store to retrieve the mail. -The authentication and authorization of the URLAUTH is performed whithin +The authentication and authorization of the URLAUTH is performed within this service. Because access to the mailbox and the associated mailbox keys is necessary to retrieve the message and for verification of the URLAUTH, the urlauth services need root privileges. To mitigate security concerns, the diff --git a/src/imap/cmd-sort.c b/src/imap/cmd-sort.c index 3719c604ff..37527c80ac 100644 --- a/src/imap/cmd-sort.c +++ b/src/imap/cmd-sort.c @@ -38,7 +38,7 @@ get_sort_program(struct client_command_context *cmd, bool reverse, last_reverse; if (IMAP_ARG_IS_EOL(args)) { - /* empyty list */ + /* empty list */ client_send_command_error(cmd, "Empty sort program."); return -1; } diff --git a/src/lib-dcrypt/ostream-encrypt.c b/src/lib-dcrypt/ostream-encrypt.c index 5e11af192a..19b103ed5b 100644 --- a/src/lib-dcrypt/ostream-encrypt.c +++ b/src/lib-dcrypt/ostream-encrypt.c @@ -1,4 +1,4 @@ -/* file truct dcrypt_public_keyyntax +/* file struct dcrypt_public_key syntax * magic (14 bytes) * version (1 bytes) * flags (4 bytes) @@ -468,7 +468,7 @@ ssize_t o_stream_encrypt_sendv(struct ostream_private *stream, } } - /* hopefully upstream can accomondate */ + /* hopefully upstream can accommodate */ if (o_stream_encrypt_send(estream, buf.data, buf.used) < 0) { return -1; } diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c index c62b9694ac..3178a2a3b0 100644 --- a/src/lib-fs/fs-metawrap.c +++ b/src/lib-fs/fs-metawrap.c @@ -116,7 +116,7 @@ fs_metawrap_file_init(struct fs *_fs, const char *path, if (file->fs->wrap_metadata && mode == FS_OPEN_MODE_READONLY && (flags & FS_OPEN_FLAG_ASYNC) == 0) { /* use async stream for parent, so fs_read_stream() won't create - another seekable stream unneededly */ + another seekable stream needlessly */ file->super_read = fs_file_init(_fs->parent, path, mode | flags | FS_OPEN_FLAG_ASYNC); } else { diff --git a/src/lib-fts/fts-filter.h b/src/lib-fts/fts-filter.h index 0c89f2566e..89060b7971 100644 --- a/src/lib-fts/fts-filter.h +++ b/src/lib-fts/fts-filter.h @@ -31,7 +31,7 @@ extern const struct fts_filter *fts_filter_stemmer_snowball; */ extern const struct fts_filter *fts_filter_normalizer_icu; -/* Lowecases the input. Supports UTF8, if libicu is available. */ +/* Lowercases the input. Supports UTF8, if libicu is available. */ extern const struct fts_filter *fts_filter_lowercase; /* Removes <'s> suffix from words. */ diff --git a/src/lib-http/test-http-client-errors.c b/src/lib-http/test-http-client-errors.c index ca33cf0ff3..a2229033d9 100644 --- a/src/lib-http/test-http-client-errors.c +++ b/src/lib-http/test-http-client-errors.c @@ -1815,7 +1815,7 @@ test_request_aborted_early_input(struct server_connection *conn ATTR_UNUSED) "HTTP/1.1 404 Not Found\r\n" "\r\n"; - /* wait one second to respon */ + /* wait one second to respond */ sleep(1); /* respond */ @@ -2018,7 +2018,7 @@ test_client_deinit_early_input(struct server_connection *conn ATTR_UNUSED) "HTTP/1.1 404 Not Found\r\n" "\r\n"; - /* wait one second to respon */ + /* wait one second to respond */ sleep(1); /* respond */ diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c index c3a9fe6f9c..45e2280255 100644 --- a/src/lib-imap-client/imapc-connection.c +++ b/src/lib-imap-client/imapc-connection.c @@ -1261,7 +1261,7 @@ static int imapc_connection_input_plus(struct imapc_connection *conn) /* "+ idling" reply for IDLE command */ conn->idle_plus_waiting = FALSE; conn->idling = TRUE; - /* no timeouting while IDLEing */ + /* no timing out while IDLEing */ if (conn->to != NULL && !conn->idle_stopping) timeout_remove(&conn->to); } else if (cmds_count > 0 && cmds[0]->wait_for_literal) { diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c index b34b613c98..f0e228e74c 100644 --- a/src/lib-index/mail-cache-transaction.c +++ b/src/lib-index/mail-cache-transaction.c @@ -572,7 +572,7 @@ int mail_cache_transaction_commit(struct mail_cache_transaction_ctx **_ctx) } /* Here would be a good place to do fdatasync() to make sure everything is written before offsets are updated to index. - However it slows down I/O unneededly and we're pretty good + However it slows down I/O needlessly and we're pretty good at catching and fixing cache corruption, so we no longer do it. */ } diff --git a/src/lib-index/mail-index-map-hdr.c b/src/lib-index/mail-index-map-hdr.c index f3b883e940..4725eab1c7 100644 --- a/src/lib-index/mail-index-map-hdr.c +++ b/src/lib-index/mail-index-map-hdr.c @@ -16,7 +16,7 @@ int mail_index_map_parse_extensions(struct mail_index_map *map) doesn't happen to be 64bit aligned we'll skip some bytes */ offset = MAIL_INDEX_HEADER_SIZE_ALIGN(map->hdr.base_header_size); if (offset >= map->hdr.header_size && map->extension_pool == NULL) { - /* nothing to do, skip allocatations and all */ + /* nothing to do, skip allocations and all */ return 0; } diff --git a/src/lib-index/mail-index-map.c b/src/lib-index/mail-index-map.c index 48a9cbd2fb..df6ebe7d7a 100644 --- a/src/lib-index/mail-index-map.c +++ b/src/lib-index/mail-index-map.c @@ -28,7 +28,7 @@ void mail_index_map_init_extbufs(struct mail_index_map *map, p_clear(map->extension_pool); /* try to use the existing pool's size for initial_count so - we don't grow it unneededly */ + we don't grow it needlessly */ size = p_get_max_easy_alloc_size(map->extension_pool); if (size > EXT_GLOBAL_ALLOC_SIZE + EXT_PER_ALLOC_SIZE) { initial_count = (size - EXT_GLOBAL_ALLOC_SIZE) / diff --git a/src/lib-index/mail-index-strmap.h b/src/lib-index/mail-index-strmap.h index 8b992affad..5366a97479 100644 --- a/src/lib-index/mail-index-strmap.h +++ b/src/lib-index/mail-index-strmap.h @@ -44,7 +44,7 @@ mail_index_strmap_init(struct mail_index *index, const char *suffix); void mail_index_strmap_deinit(struct mail_index_strmap **strmap); /* Returns strmap records and hash that can be used for read-only access. - The records array always teminates with a record containing zeros (but it's + The records array always terminates with a record containing zeros (but it's not counted in the array count). */ struct mail_index_strmap_view * mail_index_strmap_view_open(struct mail_index_strmap *strmap, diff --git a/src/lib-index/mail-index-transaction-finish.c b/src/lib-index/mail-index-transaction-finish.c index 4c9f9336ed..e74afeec9a 100644 --- a/src/lib-index/mail-index-transaction-finish.c +++ b/src/lib-index/mail-index-transaction-finish.c @@ -92,7 +92,7 @@ mail_transaction_drop_range(struct mail_index_transaction *t, if (keep_count == 1 && update.uid1 == keep_range[0].seq1 && update.uid2 == keep_range[0].seq2) { - /* evereything is kept */ + /* everything is kept */ return update_idx + 1; } diff --git a/src/lib-index/mail-index-view.c b/src/lib-index/mail-index-view.c index aacc5980c0..ed157dba17 100644 --- a/src/lib-index/mail-index-view.c +++ b/src/lib-index/mail-index-view.c @@ -229,7 +229,7 @@ view_lookup_full(struct mail_index_view *view, uint32_t seq, *expunged_r = FALSE; return head_rec; } else { - /* expuned from head. use the old record. */ + /* expunged from head. use the old record. */ *map_r = view->map; if (expunged_r != NULL) *expunged_r = TRUE; diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h index 24f3909112..9c4c2b3741 100644 --- a/src/lib-index/mail-index.h +++ b/src/lib-index/mail-index.h @@ -543,7 +543,7 @@ void mail_index_append(struct mail_index_transaction *t, uint32_t uid, /* Assign UIDs for mails with uid=0 or uid * diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c index 8af16d4b94..514733bb4b 100644 --- a/src/lib-settings/settings.c +++ b/src/lib-settings/settings.c @@ -152,7 +152,7 @@ settings_include(const char *pattern, struct input_stack **inputp, return -1; } - /* iterate throuth the different files matching the globbing */ + /* iterate through the different files matching the globbing */ for (i = 0; i < globbers.gl_pathc; i++) { if (settings_add_include(globbers.gl_pathv[i], inputp, ignore_errors, error_r) < 0) diff --git a/src/lib-smtp/lmtp-client.h b/src/lib-smtp/lmtp-client.h index f3ae9b14c9..a1be5231cf 100644 --- a/src/lib-smtp/lmtp-client.h +++ b/src/lib-smtp/lmtp-client.h @@ -76,7 +76,7 @@ void lmtp_client_close(struct lmtp_client *client); use CRLF line feeds and end with CRLF. */ void lmtp_client_set_data_header(struct lmtp_client *client, const char *str); /* Add recipient to the session. rcpt_to_callback is called once LMTP server - replies with RCPT TO. If RCPT TO was a succees, data_callback is called + replies with RCPT TO. If RCPT TO was a success, data_callback is called when DATA replies. */ void lmtp_client_add_rcpt(struct lmtp_client *client, const char *address, lmtp_callback_t *rcpt_to_callback, diff --git a/src/lib-ssl-iostream/ostream-openssl.c b/src/lib-ssl-iostream/ostream-openssl.c index b000286633..8cfc34483a 100644 --- a/src/lib-ssl-iostream/ostream-openssl.c +++ b/src/lib-ssl-iostream/ostream-openssl.c @@ -47,7 +47,7 @@ o_stream_ssl_buffer(struct ssl_ostream *sstream, const struct const_iovec *iov, } if (sstream->ostream.max_buffer_size == 0) { - /* we're requeted to use whatever space is available in + /* we're requested to use whatever space is available in the buffer */ avail = buffer_get_writable_size(sstream->buffer) - sstream->buffer->used; } else { diff --git a/src/lib-storage/index/dbox-common/dbox-file.c b/src/lib-storage/index/dbox-common/dbox-file.c index 461ea36182..c7220ff71f 100644 --- a/src/lib-storage/index/dbox-common/dbox-file.c +++ b/src/lib-storage/index/dbox-common/dbox-file.c @@ -523,7 +523,7 @@ void dbox_file_append_rollback(struct dbox_file_append_context **_ctx) if (ctx->first_append_offset == 0) { /* nothing changed */ } else if (ctx->first_append_offset == file->file_header_size) { - /* rollbacking everything */ + /* rolling back everything */ if (unlink(file->cur_path) < 0) dbox_file_set_syscall_error(file, "unlink()"); close_file = TRUE; diff --git a/src/lib-storage/index/dbox-single/sdbox-file.h b/src/lib-storage/index/dbox-single/sdbox-file.h index 84b6e53be0..91d4ccb24a 100644 --- a/src/lib-storage/index/dbox-single/sdbox-file.h +++ b/src/lib-storage/index/dbox-single/sdbox-file.h @@ -38,7 +38,7 @@ int sdbox_file_create_fd(struct dbox_file *file, const char *path, int sdbox_file_move(struct dbox_file *file, bool alt_path); /* Unlink file and all of its referenced attachments. */ int sdbox_file_unlink_with_attachments(struct sdbox_file *sfile); -/* Unlink file and its attachments when rollbacking a saved message. */ +/* Unlink file and its attachments when rolling back a saved message. */ int sdbox_file_unlink_aborted_save(struct sdbox_file *file); #endif diff --git a/src/lib-storage/index/index-search-mime.c b/src/lib-storage/index/index-search-mime.c index 76b21f6da5..84b074f926 100644 --- a/src/lib-storage/index/index-search-mime.c +++ b/src/lib-storage/index/index-search-mime.c @@ -96,7 +96,7 @@ static int seach_arg_mime_child_match(struct search_mimepart_context *mpctx, T_BEGIN { ARRAY(struct search_mimepart_stack) prev_stack; - /* preserve current stack for any nested CHILD PARENT nastyness */ + /* preserve current stack for any nested CHILD PARENT nastiness */ t_array_init(&prev_stack, 16); array_copy(&prev_stack.arr, 0, &mpctx->stack.arr, 0, array_count(&mpctx->stack)); diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c index 13edd8e2fe..9679a08f49 100644 --- a/src/lib-storage/index/index-storage.c +++ b/src/lib-storage/index/index-storage.c @@ -1021,7 +1021,7 @@ void index_copy_cache_fields(struct mail_save_context *ctx, i_unreached(); /* the only reason we're doing the destination lookup is to make sure that the cache file is opened and the cache - decisinos are up to date */ + decisions are up to date */ if (mailbox_get_metadata(ctx->transaction->box, MAILBOX_METADATA_CACHE_FIELDS, &dest_metadata) < 0) diff --git a/src/lib-storage/index/maildir/maildir-sync.c b/src/lib-storage/index/maildir/maildir-sync.c index d847f06337..c3721ec756 100644 --- a/src/lib-storage/index/maildir/maildir-sync.c +++ b/src/lib-storage/index/maildir/maildir-sync.c @@ -195,7 +195,7 @@ readdir() skips some files. we don't of course wish to lose them, so we go and rescan the new/ directory again from beginning until no files are left. This value is just an optimization to avoid checking the directory - twice unneededly. usually only NFS is the problem case. 1 is the safest + twice needlessly. usually only NFS is the problem case. 1 is the safest bet here, but I guess 5 will do just fine too. */ #define MAILDIR_RENAME_RESCAN_COUNT 5 @@ -947,7 +947,7 @@ maildir_sync_context(struct maildir_sync_context *ctx, bool forced, if (ctx->index_sync_ctx != NULL) { /* NOTE: index syncing here might cause a re-sync due to files getting lost, so this function might be called - re-entrantly. */ + reentrantly. */ ret = maildir_sync_index(ctx->index_sync_ctx, ctx->partial); if (ret < 0) maildir_sync_index_rollback(&ctx->index_sync_ctx); @@ -1095,7 +1095,7 @@ maildir_storage_sync_init(struct mailbox *box, enum mailbox_sync_flags flags) (box->flags & MAILBOX_FLAG_KEEP_LOCKED) != 0); if (lost_files) { - /* lost some files from new/, see if thery're in cur/ */ + /* lost some files from new/, see if they're in cur/ */ ret = maildir_storage_sync_force(mbox, 0); } } diff --git a/src/lib-storage/index/mbox/mbox-sync-rewrite.c b/src/lib-storage/index/mbox/mbox-sync-rewrite.c index 6fd32c2bc1..a15f3f54d2 100644 --- a/src/lib-storage/index/mbox/mbox-sync-rewrite.c +++ b/src/lib-storage/index/mbox/mbox-sync-rewrite.c @@ -242,7 +242,7 @@ static void mbox_sync_first_mail_written(struct mbox_sync_mail_context *ctx, ctx->last_uid_value_start_pos; if (ctx->imapbase_updated) { - /* update so a) we don't try to update it later unneededly, + /* update so a) we don't try to update it later needlessly, b) if we do actually update it, we see the correct value */ ctx->sync_ctx->base_uid_last = ctx->last_uid_updated_value; } diff --git a/src/lib-storage/index/mbox/mbox-sync.c b/src/lib-storage/index/mbox/mbox-sync.c index fd09d2133c..afcbbf0087 100644 --- a/src/lib-storage/index/mbox/mbox-sync.c +++ b/src/lib-storage/index/mbox/mbox-sync.c @@ -1770,7 +1770,7 @@ int mbox_sync_has_changed(struct mbox_mailbox *mbox, bool leave_dirty) /* fully synced */ if (mbox->mbox_hdr.dirty_flag != 0 || leave_dirty) return 0; - /* flushing dirtyness */ + /* flushing dirtiness */ } /* file changed */ @@ -1886,7 +1886,7 @@ again: /* nothing to do */ nothing_to_do: /* index may need to do internal syncing though, so commit - instead of rollbacking. */ + instead of rolling back. */ index_storage_expunging_deinit(&mbox->box); if (mail_index_sync_commit(&index_sync_ctx) < 0) { mailbox_set_index_error(&mbox->box); diff --git a/src/lib-storage/list/mailbox-list-index-backend.c b/src/lib-storage/list/mailbox-list-index-backend.c index 39068a8867..9b3f0c6e33 100644 --- a/src/lib-storage/list/mailbox-list-index-backend.c +++ b/src/lib-storage/list/mailbox-list-index-backend.c @@ -633,7 +633,7 @@ index_list_delete_entry(struct index_mailbox_list *list, const char *name, if (list->create_mailbox_name != NULL && strcmp(name, list->create_mailbox_name) == 0) { - /* we're rollbacking a failed create. if the name exists in the + /* we're rolling back a failed create. if the name exists in the list, it was done by somebody else so we don't want to remove it. */ return 0; diff --git a/src/lib-storage/list/mailbox-list-index-status.c b/src/lib-storage/list/mailbox-list-index-status.c index 1282c57f11..b21dd609bf 100644 --- a/src/lib-storage/list/mailbox-list-index-status.c +++ b/src/lib-storage/list/mailbox-list-index-status.c @@ -633,7 +633,7 @@ static int index_list_update_mailbox(struct mailbox *box) return 0; if (box->deleting) { /* don't update status info while mailbox is being deleted. - especially not a good idea if we're rollbacking a created + especially not a good idea if we're rolling back a created mailbox that somebody else had just created */ return 0; } diff --git a/src/lib-storage/mailbox-attribute.c b/src/lib-storage/mailbox-attribute.c index 5fce61b939..4b904e329c 100644 --- a/src/lib-storage/mailbox-attribute.c +++ b/src/lib-storage/mailbox-attribute.c @@ -404,7 +404,7 @@ mailbox_attribute_iter_init(struct mailbox *box, /* copy relevant attributes */ array_foreach(&extra_attrs, attr) { - /* skip internal server attributes unless we're interating inbox */ + /* skip internal server attributes unless we're iterating inbox */ if (!box->inbox_any && strncmp(*attr, MAILBOX_ATTRIBUTE_PREFIX_DOVECOT_PVT_SERVER, strlen(MAILBOX_ATTRIBUTE_PREFIX_DOVECOT_PVT_SERVER)) == 0) diff --git a/src/lib/array.h b/src/lib/array.h index ee209a4b15..352bd542d3 100644 --- a/src/lib/array.h +++ b/src/lib/array.h @@ -171,7 +171,7 @@ array_count_i(const struct array *array) } #define array_count(array) \ array_count_i(&(array)->arr) -/* No need for the real count if all we're doing is comparing againts 0 */ +/* No need for the real count if all we're doing is comparing against 0 */ #define array_is_empty(array) \ ((array)->arr.buffer->used == 0) #define array_not_empty(array) \ @@ -293,7 +293,7 @@ array_copy(struct array *dest, unsigned int dest_idx, /* Exchange ownership of two arrays, which should have been allocated from the same pool/context. Useful for updating an array with a - replacement. Can also do it with uninitialised arrays (which will + replacement. Can also do it with uninitialized arrays (which will have .element_size == 0). */ static inline void array_swap_i(struct array *array1, struct array *array2) diff --git a/src/lib/buffer.c b/src/lib/buffer.c index 7ea84100ac..5338cbef8b 100644 --- a/src/lib/buffer.c +++ b/src/lib/buffer.c @@ -371,7 +371,7 @@ void buffer_truncate_rshift_bits(buffer_t *buf, size_t bits) if (bits > 0) { /* truncate it to closest byte boundary */ size_t bytes = ((bits + 7) & -8U)/8; - /* remainding bits */ + /* remaining bits */ bits = bits % 8; buffer_set_used_size(buf, I_MIN(bytes, buf->used)); unsigned char *ptr = buffer_get_modifiable_data(buf, &bytes); diff --git a/src/lib/failures.c b/src/lib/failures.c index fe41cbb57a..61a48189d2 100644 --- a/src/lib/failures.c +++ b/src/lib/failures.c @@ -411,7 +411,7 @@ syslog_handler(int level, enum log_type type, const char *format, va_list args) return -1; recursed++; - /* syslogs don't generatelly bother to log the level in any way, + /* syslogs don't generally bother to log the level in any way, so make sure errors are shown clearly */ T_BEGIN { syslog(level, "%s%s%s", diff --git a/src/lib/ioloop-epoll.c b/src/lib/ioloop-epoll.c index 160098022f..1cfc947979 100644 --- a/src/lib/ioloop-epoll.c +++ b/src/lib/ioloop-epoll.c @@ -154,7 +154,7 @@ void io_loop_handle_remove(struct io_file *io, bool closed) if (last) { /* since we're not freeing memory in any case, just increase deleted counter so next handle_add() can just decrease it - insteading of appending to the events array */ + instead of appending to the events array */ ctx->deleted_count++; } i_free(io); diff --git a/src/lib/ioloop-kqueue.c b/src/lib/ioloop-kqueue.c index b8b4accfb0..62f72b2bf8 100644 --- a/src/lib/ioloop-kqueue.c +++ b/src/lib/ioloop-kqueue.c @@ -99,7 +99,7 @@ void io_loop_handle_remove(struct io_file *io, bool closed) /* since we're not freeing memory in any case, just increase deleted counter so next handle_add() can just decrease it - insteading of appending to the events array */ + instead of appending to the events array */ ctx->deleted_count++; i_assert(io->refcount > 0); diff --git a/src/lib/istream.h b/src/lib/istream.h index 8d311c868a..549708d816 100644 --- a/src/lib/istream.h +++ b/src/lib/istream.h @@ -122,7 +122,7 @@ void i_stream_set_init_buffer_size(struct istream *stream, size_t size); parent streams' max buffer size. */ void i_stream_set_max_buffer_size(struct istream *stream, size_t max_size); /* Returns the current max. buffer size for the stream. This function also - goesthrough all of the parent streams and returns the highest seen max + goes through all of the parent streams and returns the highest seen max buffer size. This is needed because some streams (e.g. istream-chain) change their max buffer size dynamically. */ size_t i_stream_get_max_buffer_size(struct istream *stream); diff --git a/src/lib/net.h b/src/lib/net.h index de23431ed0..e45cf399d7 100644 --- a/src/lib/net.h +++ b/src/lib/net.h @@ -35,7 +35,7 @@ struct net_unix_cred { pid_t pid; }; -/* maxmimum string length of IP address */ +/* maximum string length of IP address */ #define MAX_IP_LEN INET6_ADDRSTRLEN #define IPADDR_IS_V4(ip) ((ip)->family == AF_INET) diff --git a/src/lib/path-util.c b/src/lib/path-util.c index 3bcb35fbc1..5f25832b62 100644 --- a/src/lib/path-util.c +++ b/src/lib/path-util.c @@ -66,7 +66,7 @@ static int path_normalize(const char *path, bool resolve_links, ptrdiff_t seglen; const char *segend; - /* skip duplicate shashes */ + /* skip duplicate slashes */ while (*p == '/') p++; diff --git a/src/lib/sendfile-util.c b/src/lib/sendfile-util.c index 1d9823b5db..6630ddc79b 100644 --- a/src/lib/sendfile-util.c +++ b/src/lib/sendfile-util.c @@ -18,7 +18,7 @@ ssize_t safe_sendfile(int out_fd, int in_fd, uoff_t *offset, size_t count) { - /* REMEBER: uoff_t and off_t may not be of same size. */ + /* REMEMBER: uoff_t and off_t may not be of same size. */ off_t safe_offset; ssize_t ret; diff --git a/src/lib/seq-range-array.h b/src/lib/seq-range-array.h index dc21d9dce6..cdb1febba7 100644 --- a/src/lib/seq-range-array.h +++ b/src/lib/seq-range-array.h @@ -31,7 +31,7 @@ unsigned int seq_range_array_add_range_count(ARRAY_TYPE(seq_range) *array, uint32_t seq1, uint32_t seq2); void seq_range_array_merge(ARRAY_TYPE(seq_range) *dest, const ARRAY_TYPE(seq_range) *src); -/* Remove the given sequrence from range. Returns TRUE if it was found. */ +/* Remove the given sequence from range. Returns TRUE if it was found. */ bool ATTR_NOWARN_UNUSED_RESULT seq_range_array_remove(ARRAY_TYPE(seq_range) *array, uint32_t seq); /* Remove a sequence range. Returns number of sequences actually removed. */ diff --git a/src/lib/wildcard-match.c b/src/lib/wildcard-match.c index c33ef5bbc2..c1e2b2e968 100644 --- a/src/lib/wildcard-match.c +++ b/src/lib/wildcard-match.c @@ -18,7 +18,7 @@ #include #define WILDS '*' /* matches 0 or more characters (including spaces) */ -#define WILDQ '?' /* matches ecactly one character */ +#define WILDQ '?' /* matches exactly one character */ #define NOMATCH 0 #define MATCH (match+sofar) diff --git a/src/master/sd-daemon.h b/src/master/sd-daemon.h index fdf3cc0354..83400b2b3b 100644 --- a/src/master/sd-daemon.h +++ b/src/master/sd-daemon.h @@ -206,7 +206,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t fork off the process itself. Example: "MAINPID=4711" Daemons can choose to send additional variables. However, it is - recommened to prefix variable names not listed above with X_. + recommended to prefix variable names not listed above with X_. Returns a negative errno-style error code on failure. Returns > 0 if systemd could be notified, 0 if it couldn't possibly because diff --git a/src/master/service.h b/src/master/service.h index 0b56fedbdf..494a379280 100644 --- a/src/master/service.h +++ b/src/master/service.h @@ -98,7 +98,7 @@ struct service { struct timeout *to_login_notify; /* if a process fails before servicing its first request, assume it's - broken and start throtting new process creations */ + broken and start throttling new process creations */ struct timeout *to_throttle; /* when process_limit is reached, wait for a while until we actually start dropping pending connections */ diff --git a/src/plugins/acl/acl-backend-vfile-acllist.c b/src/plugins/acl/acl-backend-vfile-acllist.c index 81c06b07cb..a97f03e239 100644 --- a/src/plugins/acl/acl-backend-vfile-acllist.c +++ b/src/plugins/acl/acl-backend-vfile-acllist.c @@ -315,7 +315,7 @@ acl_backend_vfile_acllist_try_rebuild(struct acl_backend_vfile *backend) backend->acllist_mtime = st.st_mtime; backend->acllist_last_check = ioloop_time; - /* FIXME: dict reubild is expensive, try to avoid it */ + /* FIXME: dict rebuild is expensive, try to avoid it */ (void)acl_lookup_dict_rebuild(auser->acl_lookup_dict); } else { acllist_clear(backend, 0); diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c index 5b9abca86d..701eac3319 100644 --- a/src/plugins/fs-compress/fs-compress.c +++ b/src/plugins/fs-compress/fs-compress.c @@ -126,7 +126,7 @@ fs_compress_file_init(struct fs *_fs, const char *path, if (mode == FS_OPEN_MODE_READONLY && (flags & FS_OPEN_FLAG_ASYNC) == 0) { /* use async stream for parent, so fs_read_stream() won't create - another seekable stream unneededly */ + another seekable stream needlessly */ file->super_read = fs_file_init(_fs->parent, path, mode | flags | FS_OPEN_FLAG_ASYNC); } else { diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c index d44023290b..71dc6e25a5 100644 --- a/src/plugins/mail-crypt/doveadm-mail-crypt.c +++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c @@ -487,7 +487,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx, int ret; /* we need to use the mailbox attribute API here, as we - are not necessarely able to decrypt any of these keys + are not necessarily able to decrypt any of these keys */ ARRAY_TYPE(const_string) ids; diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c index 9f810a04fd..7799062271 100644 --- a/src/plugins/mail-crypt/fs-crypt-common.c +++ b/src/plugins/mail-crypt/fs-crypt-common.c @@ -152,7 +152,7 @@ fs_crypt_file_init(struct fs *_fs, const char *path, if (mode == FS_OPEN_MODE_READONLY && (flags & FS_OPEN_FLAG_ASYNC) == 0) { /* use async stream for super, so fs_read_stream() won't create - another seekable stream unneededly */ + another seekable stream needlessly */ file->super_read = fs_file_init(_fs->parent, path, mode | flags | FS_OPEN_FLAG_ASYNC); } else { diff --git a/src/plugins/mail-filter/istream-ext-filter.c b/src/plugins/mail-filter/istream-ext-filter.c index 0f7d4ca45c..272fbd6ac2 100644 --- a/src/plugins/mail-filter/istream-ext-filter.c +++ b/src/plugins/mail-filter/istream-ext-filter.c @@ -122,7 +122,7 @@ static ssize_t i_stream_mail_filter_read(struct istream_private *stream) } if (ret == -1 && !i_stream_have_bytes_left(&stream->istream) && stream->istream.v_offset == 0) { - /* EOF without any input -> assume the script is repoting + /* EOF without any input -> assume the script is reporting failure. pretty ugly way, but currently there's no error reporting channel. */ stream->istream.stream_errno = EIO; diff --git a/src/plugins/mail-filter/ostream-ext-filter.c b/src/plugins/mail-filter/ostream-ext-filter.c index 238999bdb1..9d4a419a34 100644 --- a/src/plugins/mail-filter/ostream-ext-filter.c +++ b/src/plugins/mail-filter/ostream-ext-filter.c @@ -92,7 +92,7 @@ static int o_stream_mail_filter_finish(struct ostream_private *stream) if (!i_stream_have_bytes_left(mstream->ext_in) && mstream->ext_in->v_offset == 0) { - /* EOF without any input -> assume the script is repoting + /* EOF without any input -> assume the script is reporting failure. pretty ugly way, but currently there's no error reporting channel. */ io_stream_set_error(&stream->iostream, "EOF without input"); diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c index deb6141dab..cf9d0e1784 100644 --- a/src/pop3/pop3-client.c +++ b/src/pop3/pop3-client.c @@ -206,7 +206,7 @@ static int read_mailbox(struct client *client, uint32_t *failed_uid_r) ret = -1; if (ret <= 0) { - /* commit the transaction instead of rollbacking to make sure + /* commit the transaction instead of rolling back to make sure we don't lose data (virtual sizes) added to cache file */ (void)mailbox_transaction_commit(&t); array_free(&message_sizes);