From 1a5d89d2bfa031903e88af9aff7eafc1b373d521 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 13 Mar 2020 10:51:55 +0200 Subject: [PATCH] lib-storage: mail_search_arg_init() - Remove support for changing uidset This is done earlier now - there's no need to do it twice. --- src/lib-storage/mail-search.c | 17 +++-------------- src/lib-storage/mail-search.h | 4 +--- src/plugins/fts/fts-search-args.c | 2 +- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/lib-storage/mail-search.c b/src/lib-storage/mail-search.c index 013a93cd74..f38926781c 100644 --- a/src/lib-storage/mail-search.c +++ b/src/lib-storage/mail-search.c @@ -84,21 +84,13 @@ mail_search_arg_change_uidset(struct mail_search_args *args, } void mail_search_arg_init(struct mail_search_args *args, - struct mail_search_arg *arg, - bool change_uidsets, - const ARRAY_TYPE(seq_range) *search_saved_uidset) + struct mail_search_arg *arg) { struct mail_search_args *thread_args; const char *keywords[2]; for (; arg != NULL; arg = arg->next) { switch (arg->type) { - case SEARCH_UIDSET: - if (change_uidsets) T_BEGIN { - mailbox_uidset_change(arg, args->box, - search_saved_uidset); - } T_END; - break; case SEARCH_MODSEQ: if (arg->value.str == NULL) break; @@ -141,9 +133,7 @@ void mail_search_arg_init(struct mail_search_args *args, /* fall through */ case SEARCH_SUB: case SEARCH_OR: - mail_search_arg_init(args, arg->value.subargs, - change_uidsets, - search_saved_uidset); + mail_search_arg_init(args, arg->value.subargs); break; default: break; @@ -171,8 +161,7 @@ void mail_search_args_init(struct mail_search_args *args, } if (!args->simplified) mail_search_args_simplify(args); - mail_search_arg_init(args, args->args, change_uidsets, - search_saved_uidset); + mail_search_arg_init(args, args->args); } void mail_search_arg_deinit(struct mail_search_arg *arg) diff --git a/src/lib-storage/mail-search.h b/src/lib-storage/mail-search.h index 69c5f86998..c1493aacbf 100644 --- a/src/lib-storage/mail-search.h +++ b/src/lib-storage/mail-search.h @@ -161,9 +161,7 @@ void mail_search_args_init(struct mail_search_args *args, /* Initialize arg and its children. args is used for getting mailbox and pool. */ void mail_search_arg_init(struct mail_search_args *args, - struct mail_search_arg *arg, - bool change_uidsets, - const ARRAY_TYPE(seq_range) *search_saved_uidset); + struct mail_search_arg *arg); /* Free memory allocated by mail_search_args_init(). The args can initialized afterwards again if needed. The args can be reused for other queries after calling this. */ diff --git a/src/plugins/fts/fts-search-args.c b/src/plugins/fts/fts-search-args.c index 651f863133..299fbfbfe9 100644 --- a/src/plugins/fts/fts-search-args.c +++ b/src/plugins/fts/fts-search-args.c @@ -252,7 +252,7 @@ int fts_search_args_expand(struct fts_backend *backend, /* duplicated args aren't initialized */ i_assert(args->init_refcount > 0); - mail_search_arg_init(args, args_dup, FALSE, NULL); + mail_search_arg_init(args, args_dup); mail_search_arg_deinit(orig_args); return 0; } -- 2.47.3