lib-imap: imap-bodystructure: Renamed imap_bodystructure_parse_header() to message_pa...

diff --git a/src/lib-imap/imap-bodystructure.c b/src/lib-imap/imap-bodystructure.c
index da27482f6c20811ceb3fb2a4ac010eb8c9788630..e705606d3e6c56fcbfec084fd4b4e607748a6c78 100644 (file)
--- a/src/lib-imap/imap-bodystructure.c
+++ b/src/lib-imap/imap-bodystructure.c
@@ -222,8 +222,9 @@ parse_content_header(struct message_part_data *data,
        }
 }
 
-void imap_bodystructure_parse_header(pool_t pool, struct message_part *part,
-                                    struct message_header_line *hdr)
+void message_part_data_parse_from_header(pool_t pool,
+       struct message_part *part,
+       struct message_header_line *hdr)
 {
        struct message_part_data *part_data;
        struct message_part_envelope_data *envelope;

diff --git a/src/lib-imap/imap-bodystructure.h b/src/lib-imap/imap-bodystructure.h
index 173095c476f16241c562ddc3a0993463e949ec77..7a24156109c039dd4fe59c9b6c5827d73a65c996 100644 (file)
--- a/src/lib-imap/imap-bodystructure.h
+++ b/src/lib-imap/imap-bodystructure.h
@@ -28,8 +28,9 @@ struct message_part;
 struct message_header_line;
 
 /* Parse a single header. Note that this modifies part->data. */
-void imap_bodystructure_parse_header(pool_t pool, struct message_part *part,
-                                    struct message_header_line *hdr);
+void message_part_data_parse_from_header(pool_t pool,
+       struct message_part *part,
+       struct message_header_line *hdr);
 
 /* Returns TRUE if BODYSTRUCTURE is
    ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" n n NIL NIL NIL) */

diff --git a/src/lib-imap/test-imap-bodystructure.c b/src/lib-imap/test-imap-bodystructure.c
index 176d5c0015098b2c27f91bfd4775fe51a9ad3deb..f0bc02ae43082f75413a58e8f2bd438816759554 100644 (file)
--- a/src/lib-imap/test-imap-bodystructure.c
+++ b/src/lib-imap/test-imap-bodystructure.c
@@ -384,7 +384,7 @@ msg_parse(pool_t pool, const char *message, bool parse_bodystructure)
                        MESSAGE_PARSER_FLAG_SKIP_BODY_BLOCK);
        while ((ret = message_parser_parse_next_block(parser, &block)) > 0) {
                if (parse_bodystructure) {
-                       imap_bodystructure_parse_header(pool, block.part,
+                       message_part_data_parse_from_header(pool, block.part,
                                                        block.hdr);
                }
        }

diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index b0467d7eae36e5de05b3e607cc82f5722d701840..fdb109e41aa25da26beb0d2cb751cebfced5bae4 100644 (file)
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -289,7 +289,7 @@ void index_mail_parse_header(struct message_part *part,
 
        if (data->save_bodystructure_header) {
                i_assert(part != NULL);
-               imap_bodystructure_parse_header(mail->mail.data_pool, part, hdr);
+               message_part_data_parse_from_header(mail->mail.data_pool, part, hdr);
        }
 
        if (data->save_envelope) {

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index ee4fc349ad045ada4c601ce52a22b6aaa2be0747..8a2e1b2791d85e898c976ef43e390750ce0ae6b0 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -607,7 +607,7 @@ static void parse_bodystructure_part_header(struct message_part *part,
                                            struct message_header_line *hdr,
                                            pool_t pool)
 {
-       imap_bodystructure_parse_header(pool, part, hdr);
+       message_part_data_parse_from_header(pool, part, hdr);
 }
 
 static bool want_plain_bodystructure_cached(struct index_mail *mail)
@@ -1997,7 +1997,7 @@ void index_mail_cache_parse_continue(struct mail *_mail)
                        if (block.hdr == NULL)
                                mail->data.header_parsed = TRUE;
                } else {
-                       imap_bodystructure_parse_header(mail->mail.data_pool,
+                       message_part_data_parse_from_header(mail->mail.data_pool,
                                                        block.part, block.hdr);
                }
        }