Renamed mailbox_get_uids() to mailbox_get_seq_range().

--HG--
branch : HEAD

diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index 1c664534cb4e57bfccebdac8a269f11b5456f427..e2244fd5f31381969e0c14cade07a0161ee60a17 100644 (file)
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -52,8 +52,8 @@ static void uids_to_seqs(struct mailbox *box, ARRAY_TYPE(seq_range) *uids)
                range = array_get(uids, &count);
                t_array_init(&seqs, count);
                for (i = 0; i < count; i++) {
-                       mailbox_get_uids(box, range[i].seq1, range[i].seq2,
-                                        &seq1, &seq2);
+                       mailbox_get_seq_range(box, range[i].seq1, range[i].seq2,
+                                             &seq1, &seq2);
                        /* since we have to notify about expunged messages,
                           we expect that all the referenced UIDs exist */
                        i_assert(seq1 != 0);

diff --git a/src/imap/imap-thread.c b/src/imap/imap-thread.c
index af3fba9da190fea691d2ab70e3701e80486941c7..95f750e565aea17d4de34989abd12d0884bbd491 100644 (file)
--- a/src/imap/imap-thread.c
+++ b/src/imap/imap-thread.c
@@ -697,7 +697,7 @@ static void gather_base_subjects(struct thread_context *ctx)
                if (!ctx->id_is_uid)
                        seq = id;
                else
-                       mailbox_get_uids(ctx->box, id, id, &seq, &seq);
+                       mailbox_get_seq_range(ctx->box, id, id, &seq, &seq);
 
                if (seq != 0) {
                        mail_set_seq(ctx->mail, seq);

diff --git a/src/lib-storage/index/cydir/cydir-storage.c b/src/lib-storage/index/cydir/cydir-storage.c
index 2c1f35f7d622382cc475a8eb2f6757ea61e9a7c2..2937948e839065e2473ad092c101f463dbaa0a7a 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-storage.c
+++ b/src/lib-storage/index/cydir/cydir-storage.c
@@ -430,7 +430,7 @@ struct mailbox cydir_mailbox = {
                index_transaction_rollback,
                index_keywords_create,
                index_keywords_free,
-               index_storage_get_uids,
+               index_storage_get_seq_range,
                index_storage_get_expunged_uids,
                index_mail_alloc,
                index_header_lookup_init,

diff --git a/src/lib-storage/index/dbox/dbox-storage.c b/src/lib-storage/index/dbox/dbox-storage.c
index a3c82964b9462835fc77028080cc4f6300ac0b8f..0e00e54aca1b23f790e1f748b83af48a3aa6fe17 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-storage.c
+++ b/src/lib-storage/index/dbox/dbox-storage.c
@@ -679,7 +679,7 @@ struct mailbox dbox_mailbox = {
                index_transaction_rollback,
                index_keywords_create,
                index_keywords_free,
-               index_storage_get_uids,
+               index_storage_get_seq_range,
                index_storage_get_expunged_uids,
                dbox_mail_alloc,
                index_header_lookup_init,

diff --git a/src/lib-storage/index/index-fetch.c b/src/lib-storage/index/index-fetch.c
index 663c35682b2d9690c933b20ecccad1430a10a7dd..bfbe630d117a0131a5a6ed07236ab7ab8676653b 100644 (file)
--- a/src/lib-storage/index/index-fetch.c
+++ b/src/lib-storage/index/index-fetch.c
@@ -6,9 +6,9 @@
 #include "index-storage.h"
 #include "index-mail.h"
 
-void index_storage_get_uids(struct mailbox *box,
-                           uint32_t uid1, uint32_t uid2,
-                           uint32_t *seq1_r, uint32_t *seq2_r)
+void index_storage_get_seq_range(struct mailbox *box,
+                                uint32_t uid1, uint32_t uid2,
+                                uint32_t *seq1_r, uint32_t *seq2_r)
 {
        struct index_mailbox *ibox = (struct index_mailbox *)box;
 

diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index bb064dc9c43cc7c3b9bf437cfcc7031af8dde63d..b72665a60e6cc47107af879c66ab1d2809d936f7 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -144,8 +144,9 @@ enum mailbox_sync_type index_sync_type_convert(enum mail_index_sync_type type);
 void index_storage_get_status(struct mailbox *box,
                              enum mailbox_status_items items,
                              struct mailbox_status *status_r);
-void index_storage_get_uids(struct mailbox *box, uint32_t uid1, uint32_t uid2,
-                           uint32_t *seq1_r, uint32_t *seq2_r);
+void index_storage_get_seq_range(struct mailbox *box,
+                                uint32_t uid1, uint32_t uid2,
+                                uint32_t *seq1_r, uint32_t *seq2_r);
 bool index_storage_get_expunged_uids(struct mailbox *box, uint64_t modseq,
                                     const ARRAY_TYPE(seq_range) *uids,
                                     ARRAY_TYPE(seq_range) *expunged_uids);

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 447998120f36f7b18754a3fb321f14635701786a..1051fdcf1f1061e955aebd0befec2de73ef7fe7f 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -1037,7 +1037,7 @@ struct mailbox maildir_mailbox = {
                index_transaction_rollback,
                index_keywords_create,
                index_keywords_free,
-               index_storage_get_uids,
+               index_storage_get_seq_range,
                index_storage_get_expunged_uids,
                index_mail_alloc,
                index_header_lookup_init,

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index cc37d42fd548aae84bda7fb60a90173bb7e17945..e0078ce99032efe76e467149ba4803aa2cda028c 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -987,7 +987,7 @@ struct mailbox mbox_mailbox = {
                index_transaction_rollback,
                index_keywords_create,
                index_keywords_free,
-               index_storage_get_uids,
+               index_storage_get_seq_range,
                index_storage_get_expunged_uids,
                index_mail_alloc,
                index_header_lookup_init,

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 9feb91e461d23a609af0a8d76a10e898eda1070c..dbdc8f166a826824ae7f7cce231cfcff51a40d83 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -287,7 +287,7 @@ struct mailbox raw_mailbox = {
                index_transaction_rollback,
                index_keywords_create,
                index_keywords_free,
-               index_storage_get_uids,
+               index_storage_get_seq_range,
                index_storage_get_expunged_uids,
                index_mail_alloc,
                index_header_lookup_init,

diff --git a/src/lib-storage/mail-search.c b/src/lib-storage/mail-search.c
index 08da19e9b2b58d67117c6e61c6387049a7c42f76..6127133932da7356008557590f0828767d755bdc 100644 (file)
--- a/src/lib-storage/mail-search.c
+++ b/src/lib-storage/mail-search.c
@@ -40,14 +40,16 @@ mailbox_uidset_change(struct mail_search_arg *arg, struct mailbox *box,
        /* put them back to the range as sequences */
        array_clear(&arg->value.seqset);
        for (i = 0; i < count; i++) {
-               mailbox_get_uids(box, uids[i].seq1, uids[i].seq2, &seq1, &seq2);
+               mailbox_get_seq_range(box, uids[i].seq1, uids[i].seq2,
+                                     &seq1, &seq2);
                if (seq1 != 0) {
                        seq_range_array_add_range(&arg->value.seqset,
                                                  seq1, seq2);
                }
                if (uids[i].seq2 == (uint32_t)-1) {
                        /* make sure the last message is in the range */
-                       mailbox_get_uids(box, 1, (uint32_t)-1, &seq1, &seq2);
+                       mailbox_get_seq_range(box, 1, (uint32_t)-1,
+                                             &seq1, &seq2);
                        seq_range_array_add(&arg->value.seqset, 0, seq2);
                }
        }

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index fb57562923eba8be49fcd4bb45fe91c479f56e3c..444f8856cd0d380a1c9368ad8de42f57605db4b4 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -123,8 +123,8 @@ struct mailbox_vfuncs {
                               bool skip_invalid);
        void (*keywords_free)(struct mail_keywords *keywords);
 
-       void (*get_uids)(struct mailbox *box, uint32_t uid1, uint32_t uid2,
-                        uint32_t *seq1_r, uint32_t *seq2_r);
+       void (*get_seq_range)(struct mailbox *box, uint32_t uid1, uint32_t uid2,
+                             uint32_t *seq1_r, uint32_t *seq2_r);
        bool (*get_expunged_uids)(struct mailbox *box, uint64_t modseq,
                                  const ARRAY_TYPE(seq_range) *uids,
                                  ARRAY_TYPE(seq_range) *expunged_uids);

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index de4fe3dd525f8d0da2462288d638c4e864f2c33d..542dcae21a0d6ccdebdbafc931cde51a315b68d9 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -603,10 +603,10 @@ void mailbox_keywords_free(struct mailbox *box,
        box->v.keywords_free(keywords);
 }
 
-void mailbox_get_uids(struct mailbox *box, uint32_t uid1, uint32_t uid2,
-                     uint32_t *seq1_r, uint32_t *seq2_r)
+void mailbox_get_seq_range(struct mailbox *box, uint32_t uid1, uint32_t uid2,
+                          uint32_t *seq1_r, uint32_t *seq2_r)
 {
-       box->v.get_uids(box, uid1, uid2, seq1_r, seq2_r);
+       box->v.get_seq_range(box, uid1, uid2, seq1_r, seq2_r);
 }
 
 bool mailbox_get_expunged_uids(struct mailbox *box, uint64_t modseq,

diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 8a68aa8bb55a7c4fa7134d301acacc74423def5f..d229595c42e75584e3f9deb97ded1b33449af9d9 100644 (file)
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -366,8 +366,8 @@ void mailbox_keywords_free(struct mailbox *box,
                           struct mail_keywords **keywords);
 
 /* Convert uid range to sequence range. */
-void mailbox_get_uids(struct mailbox *box, uint32_t uid1, uint32_t uid2,
-                     uint32_t *seq1_r, uint32_t *seq2_r);
+void mailbox_get_seq_range(struct mailbox *box, uint32_t uid1, uint32_t uid2,
+                          uint32_t *seq1_r, uint32_t *seq2_r);
 /* Get list of UIDs expunged after modseq and within the given range.
    UIDs that have been expunged after the last mailbox sync aren't returned.
    Returns TRUE if ok, FALSE if modseq is lower than we can check for. */

diff --git a/src/plugins/fts/fts-search.c b/src/plugins/fts/fts-search.c
index e34b135048c86805db71dd41c97801fa95d5c748..7b347953336264751974f4c1c725698cdaf7db7e 100644 (file)
--- a/src/plugins/fts/fts-search.c
+++ b/src/plugins/fts/fts-search.c
@@ -21,8 +21,8 @@ uid_range_to_seqs(struct mailbox *box, const ARRAY_TYPE(seq_range) *uid_range,
        range = array_get(uid_range, &count);
        i_array_init(seq_range, count);
        for (i = 0; i < count; i++) {
-               mailbox_get_uids(box, range[i].seq1, range[i].seq2,
-                                &seq1, &seq2);
+               mailbox_get_seq_range(box, range[i].seq1, range[i].seq2,
+                                     &seq1, &seq2);
                if (seq1 != 0)
                        seq_range_array_add_range(seq_range, seq1, seq2);
        }

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index 3ddf1f674d8fd8226bea56726e6ff6874fabe0d0..b91300383f949580f40a2282ffb99fbfebc60022 100644 (file)
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -176,7 +176,7 @@ static int fts_build_init(struct fts_search_context *fctx)
        if (fts_backend_get_last_uid(backend, &last_uid) < 0)
                return -1;
 
-       mailbox_get_uids(t->box, last_uid+1, (uint32_t)-1, &seq1, &seq2);
+       mailbox_get_seq_range(t->box, last_uid+1, (uint32_t)-1, &seq1, &seq2);
        if (seq1 == 0) {
                /* no new messages */
                return 0;
@@ -193,8 +193,8 @@ static int fts_build_init(struct fts_search_context *fctx)
                i_assert(last_uid < last_uid_locked);
 
                last_uid = last_uid_locked;
-               mailbox_get_uids(t->box, last_uid+1, (uint32_t)-1,
-                                &seq1, &seq2);
+               mailbox_get_seq_range(t->box, last_uid+1, (uint32_t)-1,
+                                     &seq1, &seq2);
                if (seq1 == 0) {
                        /* no new messages */
                        (void)fts_backend_build_deinit(&build);

diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index ee1d6130df04c1d7a250c0adb451c9c1e736a6ee..02a30269de6f99ab84aedc0ee0c03741b1783889 100644 (file)
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -182,8 +182,8 @@ static int lazy_expunge_move_expunges(struct mailbox *srcbox,
 
        range = array_get(&lt->expunge_seqs, &count);
        for (i = 0; i < count && ret == 0; i++) {
-               mailbox_get_uids(srcbox, range[i].seq1, range[i].seq2,
-                                &seq1, &seq2);
+               mailbox_get_seq_range(srcbox, range[i].seq1, range[i].seq2,
+                                     &seq1, &seq2);
                for (uid = range[i].seq1; uid <= range[i].seq2; uid++) {
                        if (maildir_file_do(msrcbox, uid, lazy_expunge_move,
                                            &ctx) < 0) {