From: Martti Rannanjärvi Date: Fri, 12 Aug 2016 23:26:16 +0000 (+0300) Subject: lib-storage: remove set_cache_corrupted_reason from mail_vfuncs X-Git-Tag: 2.3.0.rc1~3156 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0206dc57f2c04da69599dea5816235cfeb2b897a;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: remove set_cache_corrupted_reason from mail_vfuncs Change set_cache_corrupted signature to what set_cache_corrupted_reason used to be. --- diff --git a/src/imap/imap-fetch-body.c b/src/imap/imap-fetch-body.c index 70930706dd..b7d6bb940f 100644 --- a/src/imap/imap-fetch-body.c +++ b/src/imap/imap-fetch-body.c @@ -108,7 +108,7 @@ static int fetch_stream_continue(struct imap_fetch_context *ctx) case OSTREAM_SEND_ISTREAM_RESULT_FINISHED: if (state->cur_input->v_offset != state->cur_size) { /* Input stream gave less data than expected */ - mail_set_cache_corrupted_reason(state->cur_mail, + mail_set_cache_corrupted(state->cur_mail, state->cur_size_field, t_strdup_printf( "read(%s): FETCH %s got too little data: " "%"PRIuUOFF_T" vs %"PRIuUOFF_T, diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c index 2f28f83cc7..50def8b868 100644 --- a/src/lib-imap-storage/imap-msgpart.c +++ b/src/lib-imap-storage/imap-msgpart.c @@ -769,7 +769,7 @@ imap_msgpart_parse_bodystructure(struct mail *mail, if (imap_bodystructure_parse(bodystructure, pmail->data_pool, all_parts, &error) < 0) { - mail_set_cache_corrupted_reason(mail, + mail_set_cache_corrupted(mail, MAIL_FETCH_IMAP_BODYSTRUCTURE, t_strdup_printf( "Invalid message_part/BODYSTRUCTURE %s: %s", bodystructure, error)); diff --git a/src/lib-storage/fail-mail.c b/src/lib-storage/fail-mail.c index 4a899bd94c..7e4d9f5cc6 100644 --- a/src/lib-storage/fail-mail.c +++ b/src/lib-storage/fail-mail.c @@ -224,14 +224,8 @@ static void fail_mail_expunge(struct mail *mail ATTR_UNUSED) static void fail_mail_set_cache_corrupted(struct mail *mail ATTR_UNUSED, - enum mail_fetch_field field ATTR_UNUSED) -{ -} - -static void -fail_mail_set_cache_corrupted_reason(struct mail *mail ATTR_UNUSED, - enum mail_fetch_field field ATTR_UNUSED, - const char *reason ATTR_UNUSED) + enum mail_fetch_field field ATTR_UNUSED, + const char *reason ATTR_UNUSED) { } @@ -271,5 +265,4 @@ struct mail_vfuncs fail_mail_vfuncs = { fail_mail_expunge, fail_mail_set_cache_corrupted, NULL, - fail_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/cydir/cydir-mail.c b/src/lib-storage/index/cydir/cydir-mail.c index 03f46eb672..3c3604272f 100644 --- a/src/lib-storage/index/cydir/cydir-mail.c +++ b/src/lib-storage/index/cydir/cydir-mail.c @@ -166,5 +166,4 @@ struct mail_vfuncs cydir_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/dbox-multi/mdbox-mail.c b/src/lib-storage/index/dbox-multi/mdbox-mail.c index 0b6611c221..8608a02ed7 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-mail.c +++ b/src/lib-storage/index/dbox-multi/mdbox-mail.c @@ -262,5 +262,4 @@ struct mail_vfuncs mdbox_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/dbox-single/sdbox-mail.c b/src/lib-storage/index/dbox-single/sdbox-mail.c index 184701ddb8..4f848f8b69 100644 --- a/src/lib-storage/index/dbox-single/sdbox-mail.c +++ b/src/lib-storage/index/dbox-single/sdbox-mail.c @@ -171,5 +171,4 @@ struct mail_vfuncs sdbox_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/imapc/imapc-mail.c b/src/lib-storage/index/imapc/imapc-mail.c index 6e7e686209..cc1df901a2 100644 --- a/src/lib-storage/index/imapc/imapc-mail.c +++ b/src/lib-storage/index/imapc/imapc-mail.c @@ -606,5 +606,4 @@ struct mail_vfuncs imapc_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/index-mail-binary.c b/src/lib-storage/index/index-mail-binary.c index 852b9c7a06..9056cd28c6 100644 --- a/src/lib-storage/index/index-mail-binary.c +++ b/src/lib-storage/index/index-mail-binary.c @@ -508,7 +508,7 @@ index_mail_get_binary_size(struct mail *_mail, msg_part = msg_part_find(all_parts, bin_part->physical_pos); if (msg_part == NULL) { /* either binary.parts or mime.parts is broken */ - mail_set_cache_corrupted_reason(_mail, MAIL_FETCH_MESSAGE_PARTS, t_strdup_printf( + mail_set_cache_corrupted(_mail, MAIL_FETCH_MESSAGE_PARTS, t_strdup_printf( "BINARY part at offset %"PRIuUOFF_T" not found from MIME parts", bin_part->physical_pos)); return -1; diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c index 39e4ebf336..6eb9a1f322 100644 --- a/src/lib-storage/index/index-mail.c +++ b/src/lib-storage/index/index-mail.c @@ -157,7 +157,7 @@ void index_mail_set_message_parts_corrupted(struct mail *mail, const char *error else parts_str = binary_to_hex(part_buf->data, part_buf->used); - mail_set_cache_corrupted_reason(mail, + mail_set_cache_corrupted(mail, MAIL_FETCH_MESSAGE_PARTS, t_strdup_printf( "Cached MIME parts don't match message during parsing: %s (parts=%s)", error, parts_str)); @@ -1381,7 +1381,7 @@ int index_mail_get_special(struct mail *_mail, if (imap_body_parse_from_bodystructure( data->bodystructure, str, &error) < 0) { /* broken, continue.. */ - mail_set_cache_corrupted_reason(_mail, + mail_set_cache_corrupted(_mail, MAIL_FETCH_IMAP_BODYSTRUCTURE, t_strdup_printf( "Invalid BODYSTRUCTURE %s: %s", data->bodystructure, error)); @@ -2157,14 +2157,8 @@ void index_mail_precache(struct mail *mail) } void index_mail_set_cache_corrupted(struct mail *mail, - enum mail_fetch_field field) -{ - index_mail_set_cache_corrupted_reason(mail, field, ""); -} - -void index_mail_set_cache_corrupted_reason(struct mail *mail, - enum mail_fetch_field field, - const char *reason) + enum mail_fetch_field field, + const char *reason) { struct index_mail *imail = (struct index_mail *)mail; const char *field_name; diff --git a/src/lib-storage/index/index-mail.h b/src/lib-storage/index/index-mail.h index 1dd4bd7c01..8a9c177a7a 100644 --- a/src/lib-storage/index/index-mail.h +++ b/src/lib-storage/index/index-mail.h @@ -236,10 +236,8 @@ void index_mail_update_pvt_modseq(struct mail *mail, uint64_t min_pvt_modseq); void index_mail_expunge(struct mail *mail); void index_mail_precache(struct mail *mail); void index_mail_set_cache_corrupted(struct mail *mail, - enum mail_fetch_field field); -void index_mail_set_cache_corrupted_reason(struct mail *mail, - enum mail_fetch_field field, - const char *reason); + enum mail_fetch_field field, + const char *reason); int index_mail_opened(struct mail *mail, struct istream **stream); int index_mail_stream_check_failure(struct index_mail *mail); void index_mail_stream_log_failure_for(struct index_mail *mail, diff --git a/src/lib-storage/index/istream-mail.c b/src/lib-storage/index/istream-mail.c index 5c6a73f3bb..dfccf32c6c 100644 --- a/src/lib-storage/index/istream-mail.c +++ b/src/lib-storage/index/istream-mail.c @@ -80,7 +80,7 @@ i_stream_mail_set_size_corrupted(struct mail_istream *mstream, size_t size) mstream->expected_size, chr, cur_size, mailbox_get_vname(mstream->mail->box), mstream->mail->uid, mail_id); - mail_set_cache_corrupted_reason(mstream->mail, MAIL_FETCH_PHYSICAL_SIZE, + mail_set_cache_corrupted(mstream->mail, MAIL_FETCH_PHYSICAL_SIZE, t_strdup_printf("read(%s) failed: %s", i_stream_get_name(&mstream->istream.istream), mstream->istream.iostream.error)); diff --git a/src/lib-storage/index/maildir/maildir-mail.c b/src/lib-storage/index/maildir/maildir-mail.c index 9c39127629..7dc5e3ec00 100644 --- a/src/lib-storage/index/maildir/maildir-mail.c +++ b/src/lib-storage/index/maildir/maildir-mail.c @@ -753,22 +753,16 @@ maildir_mail_remove_sizes_from_filename(struct mail *mail, (void)maildir_file_do(mbox, mail->uid, do_fix_size, &ctx); } -static void maildir_mail_set_cache_corrupted_reason(struct mail *_mail, - enum mail_fetch_field field, - const char *reason) +static void maildir_mail_set_cache_corrupted(struct mail *_mail, + enum mail_fetch_field field, + const char *reason) { if (field == MAIL_FETCH_PHYSICAL_SIZE || field == MAIL_FETCH_VIRTUAL_SIZE) { maildir_mail_remove_sizes_from_uidlist(_mail); maildir_mail_remove_sizes_from_filename(_mail, field); } - index_mail_set_cache_corrupted_reason(_mail, field, reason); -} - -static void maildir_mail_set_cache_corrupted(struct mail *_mail, - enum mail_fetch_field field) -{ - maildir_mail_set_cache_corrupted_reason(_mail, field, ""); + index_mail_set_cache_corrupted(_mail, field, reason); } struct mail_vfuncs maildir_mail_vfuncs = { @@ -807,5 +801,4 @@ struct mail_vfuncs maildir_mail_vfuncs = { index_mail_expunge, maildir_mail_set_cache_corrupted, index_mail_opened, - maildir_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/mbox/mbox-mail.c b/src/lib-storage/index/mbox/mbox-mail.c index 3542919429..946b94d709 100644 --- a/src/lib-storage/index/mbox/mbox-mail.c +++ b/src/lib-storage/index/mbox/mbox-mail.c @@ -447,5 +447,4 @@ struct mail_vfuncs mbox_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/pop3c/pop3c-mail.c b/src/lib-storage/index/pop3c/pop3c-mail.c index fe6643ee61..7db2c36329 100644 --- a/src/lib-storage/index/pop3c/pop3c-mail.c +++ b/src/lib-storage/index/pop3c/pop3c-mail.c @@ -303,5 +303,4 @@ struct mail_vfuncs pop3c_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/index/raw/raw-mail.c b/src/lib-storage/index/raw/raw-mail.c index 4cdeafdb73..dacf3ab792 100644 --- a/src/lib-storage/index/raw/raw-mail.c +++ b/src/lib-storage/index/raw/raw-mail.c @@ -150,5 +150,4 @@ struct mail_vfuncs raw_mail_vfuncs = { index_mail_expunge, index_mail_set_cache_corrupted, index_mail_opened, - index_mail_set_cache_corrupted_reason }; diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h index 6ea7628564..daf0a6031c 100644 --- a/src/lib-storage/mail-storage-private.h +++ b/src/lib-storage/mail-storage-private.h @@ -475,11 +475,9 @@ struct mail_vfuncs { void (*update_pop3_uidl)(struct mail *mail, const char *uidl); void (*expunge)(struct mail *mail); void (*set_cache_corrupted)(struct mail *mail, - enum mail_fetch_field field); + enum mail_fetch_field field, + const char *reason); int (*istream_opened)(struct mail *mail, struct istream **input); - void (*set_cache_corrupted_reason)(struct mail *mail, - enum mail_fetch_field field, - const char *reason); }; union mail_module_context { diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h index d9c8815892..06cbaeadce 100644 --- a/src/lib-storage/mail-storage.h +++ b/src/lib-storage/mail-storage.h @@ -912,10 +912,9 @@ void mail_expunge(struct mail *mail); /* Add missing fields to cache. */ void mail_precache(struct mail *mail); /* Mark a cached field corrupted and have it recalculated. */ -void mail_set_cache_corrupted(struct mail *mail, enum mail_fetch_field field); -void mail_set_cache_corrupted_reason(struct mail *mail, - enum mail_fetch_field field, - const char *reason); +void mail_set_cache_corrupted(struct mail *mail, + enum mail_fetch_field field, + const char *reason); /* Return 128 bit GUID using input string. If guid is already 128 bit hex encoded, it's returned as-is. Otherwise SHA1 sum is taken and its last diff --git a/src/lib-storage/mail.c b/src/lib-storage/mail.c index 47b6b232b0..8c41a83a36 100644 --- a/src/lib-storage/mail.c +++ b/src/lib-storage/mail.c @@ -421,24 +421,12 @@ void mail_precache(struct mail *mail) } T_END; } -void mail_set_cache_corrupted(struct mail *mail, enum mail_fetch_field field) -{ - mail_set_cache_corrupted_reason(mail, field, ""); -} - -void mail_set_cache_corrupted_reason(struct mail *mail, - enum mail_fetch_field field, - const char *reason) +void mail_set_cache_corrupted(struct mail *mail, + enum mail_fetch_field field, + const char *reason) { struct mail_private *p = (struct mail_private *)mail; - - /* FIXME: v2.3: rename set_cache_corrupted_reason() to just - set_cache_corrupted(). we have two here for backwards API - compatibility. */ - if (p->v.set_cache_corrupted_reason != NULL) - p->v.set_cache_corrupted_reason(mail, field, reason); - else - p->v.set_cache_corrupted(mail, field); + p->v.set_cache_corrupted(mail, field, reason); } void mail_generate_guid_128_hash(const char *guid, guid_128_t guid_128_r) diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c index 84e6d6eddd..78443266d9 100644 --- a/src/plugins/virtual/virtual-mail.c +++ b/src/plugins/virtual/virtual-mail.c @@ -483,22 +483,16 @@ static void virtual_mail_expunge(struct mail *mail) } static void -virtual_mail_set_cache_corrupted_reason(struct mail *mail, - enum mail_fetch_field field, - const char *reason) +virtual_mail_set_cache_corrupted(struct mail *mail, + enum mail_fetch_field field, + const char *reason) { struct virtual_mail *vmail = (struct virtual_mail *)mail; struct mail *backend_mail; if (backend_mail_get(vmail, &backend_mail) < 0) return; - mail_set_cache_corrupted_reason(backend_mail, field, reason); -} - -static void -virtual_mail_set_cache_corrupted(struct mail *mail, enum mail_fetch_field field) -{ - virtual_mail_set_cache_corrupted_reason(mail, field, ""); + mail_set_cache_corrupted(backend_mail, field, reason); } struct mail_vfuncs virtual_mail_vfuncs = { @@ -537,5 +531,4 @@ struct mail_vfuncs virtual_mail_vfuncs = { virtual_mail_expunge, virtual_mail_set_cache_corrupted, NULL, - virtual_mail_set_cache_corrupted_reason };