From: Marco Bettini Date: Fri, 5 Aug 2022 08:48:55 +0000 (+0000) Subject: plugins: Remove stray whitespaces X-Git-Tag: 2.4.0~3706 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=775475ca32597dde811e5b52637dd55d2744b71d;p=thirdparty%2Fdovecot%2Fcore.git plugins: Remove stray whitespaces --- diff --git a/src/plugins/acl/acl-cache.c b/src/plugins/acl/acl-cache.c index 1138980633..f91d09467d 100644 --- a/src/plugins/acl/acl-cache.c +++ b/src/plugins/acl/acl-cache.c @@ -321,7 +321,7 @@ void acl_cache_set_validity(struct acl_cache *cache, const char *objname, if (created) { /* negative cache entry */ obj_cache->my_current_rights = &negative_cache_entry; - } + } } void *acl_cache_get_validity(struct acl_cache *cache, const char *objname) diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc b/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc index cb1ae75419..0145e2e580 100644 --- a/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc +++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc @@ -447,7 +447,7 @@ fts_flatcurve_xapian_write_db_get(struct flatcurve_fts_backend *backend, if (xdb->type == FLATCURVE_XAPIAN_DB_TYPE_CURRENT && fts_flatcurve_xapian_check_db_version(backend, xdb, error_r) < 0) - return -1; + return -1; e_debug(backend->event, "Opened DB (RW, %s) messages=%u version=%u", xdb->dbpath->fname, xdb->dbw->get_doccount(), @@ -853,7 +853,7 @@ fts_flatcurve_xapian_mailbox_check(struct flatcurve_fts_backend *backend, static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); struct flatcurve_xapian *x = backend->xapian; i_zero(check); @@ -893,8 +893,8 @@ int fts_flatcurve_xapian_mailbox_rotate(struct flatcurve_fts_backend *backend, { static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) - (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); struct flatcurve_xapian_db *xdb; int ret = fts_flatcurve_xapian_write_db_current( @@ -914,8 +914,8 @@ fts_flatcurve_xapian_mailbox_stats(struct flatcurve_fts_backend *backend, { static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) - (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); struct flatcurve_xapian *x = backend->xapian; if (x->db_read == NULL) { @@ -1059,8 +1059,8 @@ fts_flatcurve_database_terms_fetch(bool headers, { static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) - (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); Xapian::Database *db; Xapian::TermIterator iter, end; @@ -1086,7 +1086,7 @@ fts_flatcurve_database_terms_fetch(bool headers, if (*key == *FLATCURVE_XAPIAN_ALL_HEADERS_PREFIX) ++key; else if (*key == *FLATCURVE_XAPIAN_BOOLEAN_FIELD_PREFIX || - *key == *FLATCURVE_XAPIAN_HEADER_PREFIX) + *key == *FLATCURVE_XAPIAN_HEADER_PREFIX) continue; } @@ -1435,7 +1435,7 @@ fts_flatcurve_xapian_close_db(struct flatcurve_fts_backend *backend, if (xdb->db != NULL && HAS_ANY_BITS(opts, FLATCURVE_XAPIAN_DB_CLOSE_DB | - FLATCURVE_XAPIAN_DB_CLOSE_MBOX)) { + FLATCURVE_XAPIAN_DB_CLOSE_MBOX)) { delete(xdb->db); xdb->db = NULL; } @@ -1526,7 +1526,7 @@ int fts_flatcurve_xapian_get_last_uid(struct flatcurve_fts_backend *backend, static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); Xapian::Database *db; int ret = fts_flatcurve_xapian_read_db(backend, opts, &db, error_r); @@ -1561,7 +1561,7 @@ int fts_flatcurve_xapian_uid_exists(struct flatcurve_fts_backend *backend, static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); if (fts_flatcurve_xapian_read_db(backend, opts, NULL, error_r) <= 0) return -1; @@ -1772,7 +1772,7 @@ fts_flatcurve_xapian_optimize_rebuild(struct flatcurve_fts_backend *backend, xdb->type = FLATCURVE_XAPIAN_DB_TYPE_OPTIMIZE; if (fts_flatcurve_xapian_write_db_get( - backend, xdb, FLATCURVE_XAPIAN_WDB_CREATE, error_r) < 0) + backend, xdb, FLATCURVE_XAPIAN_WDB_CREATE, error_r) < 0) return -1; Xapian::Enquire enquire(*db); @@ -1918,7 +1918,7 @@ int fts_flatcurve_xapian_optimize_box(struct flatcurve_fts_backend *backend, static const enum flatcurve_xapian_db_opts opts = (enum flatcurve_xapian_db_opts) (FLATCURVE_XAPIAN_DB_NOCREATE_CURRENT | - FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); + FLATCURVE_XAPIAN_DB_IGNORE_EMPTY); Xapian::Database *db; int ret; diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c index 181abe93c4..ba074dab65 100644 --- a/src/plugins/fts-solr/fts-backend-solr.c +++ b/src/plugins/fts-solr/fts-backend-solr.c @@ -853,7 +853,7 @@ fts_backend_solr_lookup(struct fts_backend *_backend, struct mailbox *box, if (solr_search(_backend, str, box_guid, &result->maybe_uids, &result->scores) < 0) return -1; - } + } result->scores_sorted = TRUE; return 0; } diff --git a/src/plugins/fts/decode2text.sh b/src/plugins/fts/decode2text.sh index 1c881ff942..151fb7ce0f 100755 --- a/src/plugins/fts/decode2text.sh +++ b/src/plugins/fts/decode2text.sh @@ -60,7 +60,7 @@ xmlunzip() { name=$1 tempdir=`mktemp -d` - if [ "$tempdir" = "" ]; then + if [ "$tempdir" = "" ]; then exit 1 fi trap "rm -rf $path $tempdir" 0 1 2 3 14 15 diff --git a/src/plugins/fts/fts-expunge-log.c b/src/plugins/fts/fts-expunge-log.c index d39ceeaca3..90e99d331b 100644 --- a/src/plugins/fts/fts-expunge-log.c +++ b/src/plugins/fts/fts-expunge-log.c @@ -560,7 +560,7 @@ bool fts_expunge_log_contains(const struct fts_expunge_log_append_ctx *ctx, mailbox = hash_table_lookup(ctx->mailboxes, guid_p); if (mailbox == NULL) return FALSE; - return seq_range_exists(&mailbox->uids, uid); + return seq_range_exists(&mailbox->uids, uid); } int fts_expunge_log_append_remove(struct fts_expunge_log_append_ctx *from, const struct fts_expunge_log_read_record *record) diff --git a/src/plugins/fts/fts-user.c b/src/plugins/fts/fts-user.c index 3c813cd9dd..bd88655c2a 100644 --- a/src/plugins/fts/fts-user.c +++ b/src/plugins/fts/fts-user.c @@ -240,7 +240,7 @@ fts_user_language_find(struct mail_user *user, { struct fts_user_language *user_lang; struct fts_user *fuser = FTS_USER_CONTEXT(user); - + i_assert(fuser != NULL); array_foreach_elem(&fuser->languages, user_lang) { if (strcmp(user_lang->lang->name, lang->name) == 0) diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c index 0477b69181..9bb91ea67a 100644 --- a/src/plugins/mail-crypt/doveadm-mail-crypt.c +++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c @@ -400,9 +400,9 @@ static int mcp_keypair_generate_run(struct doveadm_mail_cmd_context *_ctx, const struct mailbox_info *info; struct mailbox_list_iterate_context *iter = mailbox_list_iter_init_namespaces(user->namespaces, - patterns, + patterns, MAIL_NAMESPACE_TYPE_PRIVATE, - MAILBOX_LIST_ITER_SKIP_ALIASES | + MAILBOX_LIST_ITER_SKIP_ALIASES | MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS); while((info = mailbox_list_iter_next(iter)) != NULL) { @@ -535,7 +535,7 @@ static void mcp_key_list(struct mcp_cmd_context *ctx, iter = mailbox_attribute_iter_init(box, MAIL_ATTRIBUTE_TYPE_PRIVATE, - USER_CRYPT_PREFIX + USER_CRYPT_PREFIX PRIVKEYS_PREFIX); const char *key_id; if (value.value == NULL) diff --git a/src/plugins/mail-crypt/test-mail-key.c b/src/plugins/mail-crypt/test-mail-key.c index ac8983590d..707d54bfa0 100644 --- a/src/plugins/mail-crypt/test-mail-key.c +++ b/src/plugins/mail-crypt/test-mail-key.c @@ -192,7 +192,7 @@ static void test_cache_reset(void) mail_crypt_key_cache_destroy(&muser->key_cache); test_assert(mail_crypt_user_get_private_key(test_ctx->user, NULL, - &pair.priv, &error) > 0); + &pair.priv, &error) > 0); if (error != NULL) i_error("mail_crypt_user_get_private_key() failed: %s", error); error = NULL; diff --git a/src/plugins/mail-log/mail-log-plugin.c b/src/plugins/mail-log/mail-log-plugin.c index f01cd0de70..940c36100b 100644 --- a/src/plugins/mail-log/mail-log-plugin.c +++ b/src/plugins/mail-log/mail-log-plugin.c @@ -416,7 +416,7 @@ static void mail_log_mail_update_flags(void *txn, struct mail *mail, } static void -mail_log_mail_update_keywords(void *txn, struct mail *mail, +mail_log_mail_update_keywords(void *txn, struct mail *mail, const char *const *old_keywords ATTR_UNUSED) { struct mail_log_mail_txn_context *ctx = diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c index e9ff9bb707..d7aec8c7e8 100644 --- a/src/plugins/notify/notify-plugin.c +++ b/src/plugins/notify/notify-plugin.c @@ -40,7 +40,7 @@ void notify_contexts_mail_transaction_begin(struct mailbox_transaction_context * { struct notify_context *ctx; struct notify_mail_txn *mail_txn; - + for (ctx = ctx_list; ctx != NULL; ctx = ctx->next) { mail_txn = i_new(struct notify_mail_txn, 1); mail_txn->parent_mailbox_txn = t; diff --git a/src/plugins/notify/notify-storage.c b/src/plugins/notify/notify-storage.c index b7a6a3a692..aec578f6e8 100644 --- a/src/plugins/notify/notify-storage.c +++ b/src/plugins/notify/notify-storage.c @@ -21,7 +21,7 @@ notify_mail_expunge(struct mail *_mail) { struct mail_private *mail = (struct mail_private *)_mail; union mail_module_context *lmail = NOTIFY_MAIL_CONTEXT(mail); - + notify_contexts_mail_expunge(_mail); lmail->super.expunge(_mail); } @@ -38,9 +38,9 @@ notify_mail_update_flags(struct mail *_mail, enum modify_type modify_type, lmail->super.update_flags(_mail, modify_type, flags); new_flags = mail_get_flags(_mail); - if ((old_flags ^ new_flags) == 0) + if ((old_flags ^ new_flags) == 0) return; - + notify_contexts_mail_update_flags(_mail, old_flags); } @@ -62,7 +62,7 @@ notify_mail_update_keywords(struct mail *_mail, enum modify_type modify_type, break; } - if (old_keywords[i] == NULL && new_keywords[i] == NULL) + if (old_keywords[i] == NULL && new_keywords[i] == NULL) return; notify_contexts_mail_update_keywords(_mail, old_keywords); @@ -130,7 +130,7 @@ notify_transaction_begin(struct mailbox *box, { union mailbox_module_context *lbox = NOTIFY_CONTEXT(box); struct mailbox_transaction_context *t; - + t = lbox->super.transaction_begin(box, flags, reason); if ((t->flags & MAILBOX_TRANSACTION_FLAG_NO_NOTIFY) == 0) diff --git a/src/plugins/push-notification/push-notification-events-rfc5423.c b/src/plugins/push-notification/push-notification-events-rfc5423.c index 10dd0c7e39..753652c759 100644 --- a/src/plugins/push-notification/push-notification-events-rfc5423.c +++ b/src/plugins/push-notification/push-notification-events-rfc5423.c @@ -7,7 +7,7 @@ /* These are the RFC 5423 Mail Store Events currently handled within the core push-notification code. - + @todo: These events are not currently handled: - Login - Logout diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h index 93aa3cb5a2..6ba3b812bf 100644 --- a/src/plugins/quota/quota-private.h +++ b/src/plugins/quota/quota-private.h @@ -76,7 +76,7 @@ struct quota_backend_vfuncs { uint64_t *value_r, const char **error_r); - int (*update)(struct quota_root *root, + int (*update)(struct quota_root *root, struct quota_transaction_context *ctx, const char **error_r); bool (*match_box)(struct quota_root *root, struct mailbox *box); diff --git a/src/plugins/quota/rquota.x b/src/plugins/quota/rquota.x index 3cd5c10d66..d70cd3f535 100644 --- a/src/plugins/quota/rquota.x +++ b/src/plugins/quota/rquota.x @@ -20,26 +20,26 @@ struct sq_dqblk { }; struct getquota_args { - string gqa_pathp; /* path to filesystem of interest */ + string gqa_pathp; /* path to filesystem of interest */ int gqa_uid; /* Inquire about quota for uid */ }; struct setquota_args { int sqa_qcmd; - string sqa_pathp; /* path to filesystem of interest */ + string sqa_pathp; /* path to filesystem of interest */ int sqa_id; /* Set quota for uid */ sq_dqblk sqa_dqblk; }; struct ext_getquota_args { - string gqa_pathp; /* path to filesystem of interest */ + string gqa_pathp; /* path to filesystem of interest */ int gqa_type; /* Type of quota info is needed about */ int gqa_id; /* Inquire about quota for id */ }; struct ext_setquota_args { int sqa_qcmd; - string sqa_pathp; /* path to filesystem of interest */ + string sqa_pathp; /* path to filesystem of interest */ int sqa_id; /* Set quota for id */ int sqa_type; /* Type of quota to set */ sq_dqblk sqa_dqblk; @@ -50,7 +50,7 @@ struct ext_setquota_args { */ struct rquota { int rq_bsize; /* block size for block counts */ - bool rq_active; /* indicates whether quota is active */ + bool rq_active; /* indicates whether quota is active */ unsigned int rq_bhardlimit; /* absolute limit on disk blks alloc */ unsigned int rq_bsoftlimit; /* preferred limit on disk blks */ unsigned int rq_curblocks; /* current block count */ @@ -59,7 +59,7 @@ struct rquota { unsigned int rq_curfiles; /* current # allocated files */ unsigned int rq_btimeleft; /* time left for excessive disk use */ unsigned int rq_ftimeleft; /* time left for excessive files */ -}; +}; enum qr_status { Q_OK = 1, /* quota returned */ @@ -94,7 +94,7 @@ program RQUOTAPROG { RQUOTAPROC_GETQUOTA(getquota_args) = 1; /* - * Get active quotas only + * Get active quotas only */ getquota_rslt RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2; @@ -106,7 +106,7 @@ program RQUOTAPROG { RQUOTAPROC_SETQUOTA(setquota_args) = 3; /* - * Get active quotas only + * Get active quotas only */ setquota_rslt RQUOTAPROC_SETACTIVEQUOTA(setquota_args) = 4; @@ -119,7 +119,7 @@ program RQUOTAPROG { RQUOTAPROC_GETQUOTA(ext_getquota_args) = 1; /* - * Get active quotas only + * Get active quotas only */ getquota_rslt RQUOTAPROC_GETACTIVEQUOTA(ext_getquota_args) = 2; @@ -131,7 +131,7 @@ program RQUOTAPROG { RQUOTAPROC_SETQUOTA(ext_setquota_args) = 3; /* - * Set active quotas only + * Set active quotas only */ setquota_rslt RQUOTAPROC_SETACTIVEQUOTA(ext_setquota_args) = 4; diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c index f88a279752..1ab1ae931a 100644 --- a/src/plugins/virtual/virtual-storage.c +++ b/src/plugins/virtual/virtual-storage.c @@ -782,7 +782,7 @@ virtual_get_virtual_uids(struct mailbox *box, while (i < count && uids[i].real_uid < uid) i++; if (i < count && uids[i].real_uid == uid) { i_assert(uids[i].virtual_uid > 0); - seq_range_array_add(virtual_uids_r, + seq_range_array_add(virtual_uids_r, uids[i].virtual_uid); i++; } diff --git a/src/plugins/virtual/virtual-sync.c b/src/plugins/virtual/virtual-sync.c index c08ae29b3d..8541310299 100644 --- a/src/plugins/virtual/virtual-sync.c +++ b/src/plugins/virtual/virtual-sync.c @@ -805,7 +805,7 @@ static void virtual_sync_backend_boxes_sort_uids(struct virtual_mailbox *mbox) } } -static void +static void virtual_sync_backend_add_vmsgs_results(struct virtual_sync_context *ctx, struct virtual_backend_box *bbox, uint32_t real_uid, @@ -1765,7 +1765,7 @@ virtual_sync_apply_existing_expunges(struct virtual_mailbox *mbox, if (!array_is_created(&bbox->sync_outside_expunges)) i_array_init(&bbox->sync_outside_expunges, 32); } - seq_range_array_add(&bbox->sync_outside_expunges, + seq_range_array_add(&bbox->sync_outside_expunges, vrec->real_uid); } } @@ -1811,7 +1811,7 @@ static int virtual_sync_backend_boxes(struct virtual_sync_context *ctx) i_array_init(&ctx->all_adds, 128); bboxes = array_get(&ctx->mbox->backend_boxes, &count); - + /* we have different optimizations depending on whether the virtual mailbox consists of multiple backend boxes or just one */ if (count > 1)