From ecc6feecadb2fb47bbc80d09b0c5c4083021a23c Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sun, 23 Oct 2016 19:00:10 +0200 Subject: [PATCH] lib-imap: imap-envelope: Renamed imap_envelope_parse_header() to message_part_envelope_parse_from_header(). --- src/lib-imap/imap-bodystructure.c | 2 +- src/lib-imap/imap-envelope.c | 6 +++--- src/lib-imap/imap-envelope.h | 6 +++--- src/lib-storage/index/index-mail-headers.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib-imap/imap-bodystructure.c b/src/lib-imap/imap-bodystructure.c index ac2eb2453f..6f69ce995e 100644 --- a/src/lib-imap/imap-bodystructure.c +++ b/src/lib-imap/imap-bodystructure.c @@ -271,7 +271,7 @@ void message_part_data_parse_from_header(pool_t pool, if (parent_rfc822) { /* message/rfc822, we need the envelope */ - imap_envelope_parse_header(pool, &part_data->envelope, hdr); + message_part_envelope_parse_from_header(pool, &part_data->envelope, hdr); } } diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c index 9061d8dcf3..1eccc2f3b1 100644 --- a/src/lib-imap/imap-envelope.c +++ b/src/lib-imap/imap-envelope.c @@ -94,9 +94,9 @@ envelope_get_field(const char *name) return ENVELOPE_FIELD_UNKNOWN; } -void imap_envelope_parse_header(pool_t pool, - struct message_part_envelope_data **data, - struct message_header_line *hdr) +void message_part_envelope_parse_from_header(pool_t pool, + struct message_part_envelope_data **data, + struct message_header_line *hdr) { struct message_part_envelope_data *d; enum envelope_field field; diff --git a/src/lib-imap/imap-envelope.h b/src/lib-imap/imap-envelope.h index 4bc30fb649..66f6d13c7c 100644 --- a/src/lib-imap/imap-envelope.h +++ b/src/lib-imap/imap-envelope.h @@ -8,9 +8,9 @@ struct message_part_envelope_data; extern const char *imap_envelope_headers[]; /* Update envelope data based from given header field */ -void imap_envelope_parse_header(pool_t pool, - struct message_part_envelope_data **data, - struct message_header_line *hdr); +void message_part_envelope_parse_from_header(pool_t pool, + struct message_part_envelope_data **_data, + struct message_header_line *hdr); /* Write envelope to given string */ void imap_envelope_write_part_data(struct message_part_envelope_data *data, diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c index 8360c9e7c4..70c453113f 100644 --- a/src/lib-storage/index/index-mail-headers.c +++ b/src/lib-storage/index/index-mail-headers.c @@ -297,7 +297,7 @@ void index_mail_parse_header(struct message_part *part, } if (data->save_envelope) { - imap_envelope_parse_header(mail->mail.data_pool, + message_part_envelope_parse_from_header(mail->mail.data_pool, &data->envelope_data, hdr); if (hdr == NULL) @@ -473,7 +473,7 @@ static void imap_envelope_parse_callback(struct message_header_line *hdr, struct index_mail *mail) { - imap_envelope_parse_header(mail->mail.data_pool, + message_part_envelope_parse_from_header(mail->mail.data_pool, &mail->data.envelope_data, hdr); if (hdr == NULL) -- 2.47.3