Mercurial > dovecot > core-2.2
changeset 21635:30aacb0df12f
lib-mail: message-part-data: Renamed struct message_part_envelope_data to message_part_envelope.
author | Stephan Bosch <stephan.bosch@dovecot.fi> |
---|---|
date | Mon, 24 Oct 2016 00:19:05 +0200 |
parents | e2071511ef6d |
children | c7b8d82390d4 |
files | src/lib-imap/imap-bodystructure.c src/lib-imap/imap-envelope.c src/lib-imap/imap-envelope.h src/lib-mail/message-part-data.c src/lib-mail/message-part-data.h src/lib-storage/index/index-mail-headers.c src/lib-storage/index/index-mail.h |
diffstat | 7 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-imap/imap-bodystructure.c Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-imap/imap-bodystructure.c Mon Oct 24 00:19:05 2016 +0200 @@ -196,7 +196,7 @@ child_data = part->children->data; str_append(str, " ("); - imap_envelope_write_part_data(child_data->envelope, str); + imap_envelope_write(child_data->envelope, str); str_append(str, ") "); part_write_bodystructure_siblings(part->children, str, extended);
--- a/src/lib-imap/imap-envelope.c Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-imap/imap-envelope.c Mon Oct 24 00:19:05 2016 +0200 @@ -39,7 +39,7 @@ str_append_c(str, ')'); } -void imap_envelope_write_part_data(struct message_part_envelope_data *data, +void imap_envelope_write(struct message_part_envelope *data, string_t *str) { #define NVL(str, nullstr) ((str) != NULL ? (str) : (nullstr)) @@ -147,12 +147,12 @@ } bool imap_envelope_parse_args(const struct imap_arg *args, - pool_t pool, struct message_part_envelope_data **envlp_r, + pool_t pool, struct message_part_envelope **envlp_r, const char **error_r) { - struct message_part_envelope_data *envlp; + struct message_part_envelope *envlp; - envlp = p_new(pool, struct message_part_envelope_data, 1); + envlp = p_new(pool, struct message_part_envelope, 1); if (!imap_arg_get_nstring(args++, &envlp->date)) { *error_r = "Invalid date field";
--- a/src/lib-imap/imap-envelope.h Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-imap/imap-envelope.h Mon Oct 24 00:19:05 2016 +0200 @@ -2,15 +2,15 @@ #define IMAP_ENVELOPE_H struct imap_arg; -struct message_part_envelope_data; +struct message_part_envelope; /* Write envelope to given string */ -void imap_envelope_write_part_data(struct message_part_envelope_data *data, +void imap_envelope_write(struct message_part_envelope *data, string_t *str); /* Parse envelope from arguments */ bool imap_envelope_parse_args(const struct imap_arg *args, - pool_t pool, struct message_part_envelope_data **envlp_r, + pool_t pool, struct message_part_envelope **envlp_r, const char **error_r); #endif
--- a/src/lib-mail/message-part-data.c Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-mail/message-part-data.c Mon Oct 24 00:19:05 2016 +0200 @@ -141,16 +141,16 @@ } void message_part_envelope_parse_from_header(pool_t pool, - struct message_part_envelope_data **data, + struct message_part_envelope **data, struct message_header_line *hdr) { - struct message_part_envelope_data *d; + struct message_part_envelope *d; enum envelope_field field; struct message_address **addr_p; const char **str_p; if (*data == NULL) { - *data = p_new(pool, struct message_part_envelope_data, 1); + *data = p_new(pool, struct message_part_envelope, 1); } if (hdr == NULL) @@ -425,7 +425,7 @@ struct message_header_line *hdr) { struct message_part_data *part_data; - struct message_part_envelope_data *envelope; + struct message_part_envelope *envelope; bool parent_rfc822; if (hdr == NULL) {
--- a/src/lib-mail/message-part-data.h Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-mail/message-part-data.h Mon Oct 24 00:19:05 2016 +0200 @@ -12,7 +12,7 @@ const char *value; }; -struct message_part_envelope_data { +struct message_part_envelope { const char *date, *subject; struct message_address *from, *sender, *reply_to; struct message_address *to, *cc, *bcc; @@ -35,7 +35,7 @@ const char *const *content_language; const char *content_location; - struct message_part_envelope_data *envelope; + struct message_part_envelope *envelope; }; extern const char *message_part_envelope_headers[]; @@ -55,7 +55,7 @@ /* Update envelope data based from given header field */ void message_part_envelope_parse_from_header(pool_t pool, - struct message_part_envelope_data **_data, + struct message_part_envelope **_data, struct message_header_line *hdr); /* Parse a single header. Note that this modifies part->context. */
--- a/src/lib-storage/index/index-mail-headers.c Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-storage/index/index-mail-headers.c Mon Oct 24 00:19:05 2016 +0200 @@ -269,7 +269,7 @@ string_t *str; str = str_new(mail->mail.data_pool, 256); - imap_envelope_write_part_data(mail->data.envelope_data, str); + imap_envelope_write(mail->data.envelope_data, str); mail->data.envelope = str_c(str); if (mail_cache_field_can_add(_mail->transaction->cache_trans,
--- a/src/lib-storage/index/index-mail.h Sun Oct 23 22:29:49 2016 +0200 +++ b/src/lib-storage/index/index-mail.h Mon Oct 24 00:19:05 2016 +0200 @@ -85,7 +85,7 @@ struct message_binary_part *bin_parts; const char *envelope, *body, *bodystructure, *guid, *filename; const char *from_envelope, *body_snippet; - struct message_part_envelope_data *envelope_data; + struct message_part_envelope *envelope_data; uint32_t seq; uint32_t cache_flags;