From e52d56de75d0c012de921c0b39e22e21f511e0b9 Mon Sep 17 00:00:00 2001 From: Karl Fleischmann Date: Wed, 7 Dec 2022 12:15:25 +0100 Subject: [PATCH] lib-storage: Rename imapc feature "rfc822.size" -> "fetch-size" --- src/lib-storage/index/imapc/imapc-mail-fetch.c | 6 +++--- src/lib-storage/index/imapc/imapc-mail.c | 6 +++--- src/lib-storage/index/imapc/imapc-settings.c | 2 +- src/lib-storage/index/imapc/imapc-settings.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib-storage/index/imapc/imapc-mail-fetch.c b/src/lib-storage/index/imapc/imapc-mail-fetch.c index 176830efb1..3b4817ae7a 100644 --- a/src/lib-storage/index/imapc/imapc-mail-fetch.c +++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c @@ -359,7 +359,7 @@ imapc_mail_get_wanted_fetch_fields(struct imapc_mail *mail) if ((data->wanted_fields & (MAIL_FETCH_PHYSICAL_SIZE | MAIL_FETCH_VIRTUAL_SIZE)) != 0 && data->physical_size == UOFF_T_MAX && - IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_RFC822_SIZE)) + IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_SIZE)) fields |= MAIL_FETCH_PHYSICAL_SIZE | MAIL_FETCH_VIRTUAL_SIZE; if ((data->wanted_fields & MAIL_FETCH_IMAP_BODY) != 0 && data->body == NULL && @@ -590,7 +590,7 @@ void imapc_mail_init_stream(struct imapc_mail *mail) t_strdup_printf("imapc mail uid=%u", _mail->uid)); index_mail_set_read_buffer_size(_mail, imail->data.stream); - if (!IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_RFC822_SIZE)) { + if (!IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_SIZE)) { /* enable filtering only when we're not passing through RFC822.SIZE. otherwise we'll get size mismatches. */ imapc_stream_filter(&imail->data.stream); @@ -891,7 +891,7 @@ void imapc_mail_fetch_update(struct imapc_mail *mail, } else if (strcasecmp(key, "RFC822.SIZE") == 0) { if (imap_arg_get_atom(&args[i+1], &value) && str_to_uoff(value, &size) == 0 && - IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_RFC822_SIZE)) { + IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_SIZE)) { mail->imail.data.physical_size = size; mail->imail.data.virtual_size = size; mail->imail.data.inexact_total_sizes = TRUE; diff --git a/src/lib-storage/index/imapc/imapc-mail.c b/src/lib-storage/index/imapc/imapc-mail.c index 1ecf03e3a3..d6bf9a1b89 100644 --- a/src/lib-storage/index/imapc/imapc-mail.c +++ b/src/lib-storage/index/imapc/imapc-mail.c @@ -180,7 +180,7 @@ static int imapc_mail_get_physical_size(struct mail *_mail, uoff_t *size_r) return 0; } - if (IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_RFC822_SIZE) && + if (IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_SIZE) && data->stream == NULL) { /* Trust RFC822.SIZE to be correct enough to present to the IMAP client. However, it can be wrong in some implementation @@ -390,7 +390,7 @@ void imapc_mail_update_access_parts(struct index_mail *mail) if ((data->wanted_fields & (MAIL_FETCH_PHYSICAL_SIZE | MAIL_FETCH_VIRTUAL_SIZE)) != 0) { if (index_mail_get_physical_size(_mail, &size) < 0 && - !IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_RFC822_SIZE)) + !IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_SIZE)) data->access_part |= READ_HDR | READ_BODY; } if ((data->wanted_fields & MAIL_FETCH_GUID) != 0) @@ -426,7 +426,7 @@ static void imapc_mail_set_seq(struct mail *_mail, uint32_t seq, bool saving) struct imapc_mailbox *mbox = (struct imapc_mailbox *)_mail->box; index_mail_set_seq(_mail, seq, saving); - if (IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_RFC822_SIZE)) { + if (IMAPC_BOX_HAS_FEATURE(mbox, IMAPC_FEATURE_FETCH_SIZE)) { /* RFC822.SIZE may be read from vsize record or cache. It may not be exactly correct. */ mail->data.inexact_total_sizes = TRUE; diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c index d3fca47f56..9c7484ddf9 100644 --- a/src/lib-storage/index/imapc/imapc-settings.c +++ b/src/lib-storage/index/imapc/imapc-settings.c @@ -89,7 +89,7 @@ struct imapc_feature_list { }; static const struct imapc_feature_list imapc_feature_list[] = { - { "rfc822.size", IMAPC_FEATURE_RFC822_SIZE }, + { "fetch-size", IMAPC_FEATURE_FETCH_SIZE }, { "guid-forced", IMAPC_FEATURE_GUID_FORCED }, { "fetch-headers", IMAPC_FEATURE_FETCH_HEADERS }, { "gmail-migration", IMAPC_FEATURE_GMAIL_MIGRATION }, diff --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-storage/index/imapc/imapc-settings.h index e4c1da1740..a82b951b78 100644 --- a/src/lib-storage/index/imapc/imapc-settings.h +++ b/src/lib-storage/index/imapc/imapc-settings.h @@ -5,7 +5,7 @@ /* */ enum imapc_features { - IMAPC_FEATURE_RFC822_SIZE = 0x01, + IMAPC_FEATURE_FETCH_SIZE = 0x01, IMAPC_FEATURE_GUID_FORCED = 0x02, IMAPC_FEATURE_FETCH_HEADERS = 0x04, IMAPC_FEATURE_GMAIL_MIGRATION = 0x08, -- 2.47.3