lib-mail: Moved struct message_part to a separate message-part.h

diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
index 3106821778b183200f2b5f3909fe39bd1080ce33..13ad65c859e1a8df85c5414b743ef459a11a636c 100644 (file)
--- a/src/lib-mail/Makefile.am
+++ b/src/lib-mail/Makefile.am
@@ -51,6 +51,7 @@ headers = \
        message-header-parser.h \
        message-id.h \
        message-parser.h \
+       message-part.h \
        message-part-serialize.h \
        message-search.h \
        message-size.h \

diff --git a/src/lib-mail/message-parser.h b/src/lib-mail/message-parser.h
index 97bf7e0443f8ae1c5a2b0deb4869cce6b2a4d5d2..f324b9a3cbe2de63e71d97201a20c99bbf1e985e 100644 (file)
--- a/src/lib-mail/message-parser.h
+++ b/src/lib-mail/message-parser.h
@@ -2,7 +2,7 @@
 #define MESSAGE_PARSER_H
 
 #include "message-header-parser.h"
-#include "message-size.h"
+#include "message-part.h"
 
 enum message_parser_flags {
        /* Don't return message bodies in message_blocks. */
@@ -17,38 +17,6 @@ enum message_parser_flags {
        MESSAGE_PARSER_FLAG_INCLUDE_BOUNDARIES          = 0x08
 };
 
-/* Note that these flags are used directly by message-parser-serialize, so
-   existing flags can't be changed without breaking backwards compatibility */
-enum message_part_flags {
-       MESSAGE_PART_FLAG_MULTIPART             = 0x01,
-       MESSAGE_PART_FLAG_MULTIPART_DIGEST      = 0x02,
-       MESSAGE_PART_FLAG_MESSAGE_RFC822        = 0x04,
-
-       /* content-type: text/... */
-       MESSAGE_PART_FLAG_TEXT                  = 0x08,
-
-       MESSAGE_PART_FLAG_UNUSED                = 0x10,
-
-       /* message part header or body contains NULs */
-       MESSAGE_PART_FLAG_HAS_NULS              = 0x20,
-
-       /* Mime-Version header exists. */
-       MESSAGE_PART_FLAG_IS_MIME               = 0x40
-};
-
-struct message_part {
-       struct message_part *parent;
-       struct message_part *next;
-       struct message_part *children;
-
-       uoff_t physical_pos; /* absolute position from beginning of message */
-       struct message_size header_size;
-       struct message_size body_size;
-
-       enum message_part_flags flags;
-       void *context;
-};
-
 struct message_parser_ctx;
 
 struct message_block {

diff --git a/src/lib-mail/message-part.h b/src/lib-mail/message-part.h
new file mode 100644 (file)
index 0000000..ffcaad2
--- /dev/null
+++ b/src/lib-mail/message-part.h
@@ -0,0 +1,38 @@
+#ifndef MESSAGE_PART_H
+#define MESSAGE_PART_H
+
+#include "message-size.h"
+
+/* Note that these flags are used directly by message-parser-serialize, so
+   existing flags can't be changed without breaking backwards compatibility */
+enum message_part_flags {
+       MESSAGE_PART_FLAG_MULTIPART             = 0x01,
+       MESSAGE_PART_FLAG_MULTIPART_DIGEST      = 0x02,
+       MESSAGE_PART_FLAG_MESSAGE_RFC822        = 0x04,
+
+       /* content-type: text/... */
+       MESSAGE_PART_FLAG_TEXT                  = 0x08,
+
+       MESSAGE_PART_FLAG_UNUSED                = 0x10,
+
+       /* message part header or body contains NULs */
+       MESSAGE_PART_FLAG_HAS_NULS              = 0x20,
+
+       /* Mime-Version header exists. */
+       MESSAGE_PART_FLAG_IS_MIME               = 0x40
+};
+
+struct message_part {
+       struct message_part *parent;
+       struct message_part *next;
+       struct message_part *children;
+
+       uoff_t physical_pos; /* absolute position from beginning of message */
+       struct message_size header_size;
+       struct message_size body_size;
+
+       enum message_part_flags flags;
+       void *context;
+};
+
+#endif