lib-storage: Code cleanup.

diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index 8696e9817c2178457a7d666282e68df0b72cee2f..36bcd06dc51c8b7a8dd6c3c4498f8deffa5635e9 100644 (file)
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -136,11 +136,10 @@ static unsigned int
 get_header_field_idx(struct mailbox *box, const char *field,
                     enum mail_cache_decision_type decision)
 {
-       struct mail_cache_field header_field = {
-               NULL, 0, MAIL_CACHE_FIELD_HEADER, 0,
-               MAIL_CACHE_DECISION_NO
-       };
+       struct mail_cache_field header_field;
 
+       memset(&header_field, 0, sizeof(header_field));
+       header_field.type = MAIL_CACHE_FIELD_HEADER;
        header_field.decision = decision;
        T_BEGIN {
                header_field.name = t_strconcat("hdr.", field, NULL);

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index a4affe21d410e0ee322f4e97d5a0cac2be6d2567..4d0c670348d21df3cbf1c8a8994bbc510f6aa666 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -20,23 +20,36 @@
 #include <fcntl.h>
 
 struct mail_cache_field global_cache_fields[MAIL_INDEX_CACHE_FIELD_COUNT] = {
-       { "flags", 0, MAIL_CACHE_FIELD_BITMASK, sizeof(uint32_t), 0 },
-       { "date.sent", 0, MAIL_CACHE_FIELD_FIXED_SIZE,
-         sizeof(struct mail_sent_date), 0 },
-       { "date.received", 0, MAIL_CACHE_FIELD_FIXED_SIZE,
-         sizeof(uint32_t), 0 },
-       { "date.save", 0, MAIL_CACHE_FIELD_FIXED_SIZE,
-         sizeof(uint32_t), 0 },
-       { "size.virtual", 0, MAIL_CACHE_FIELD_FIXED_SIZE,
-         sizeof(uoff_t), 0 },
-       { "size.physical", 0, MAIL_CACHE_FIELD_FIXED_SIZE,
-         sizeof(uoff_t), 0 },
-       { "imap.body", 0, MAIL_CACHE_FIELD_STRING, 0, 0 },
-       { "imap.bodystructure", 0, MAIL_CACHE_FIELD_STRING, 0, 0 },
-       { "imap.envelope", 0, MAIL_CACHE_FIELD_STRING, 0, 0 },
-       { "pop3.uidl", 0, MAIL_CACHE_FIELD_STRING, 0, 0 },
-       { "guid", 0, MAIL_CACHE_FIELD_STRING, 0, 0 },
-       { "mime.parts", 0, MAIL_CACHE_FIELD_VARIABLE_SIZE, 0, 0 }
+       { .name = "flags",
+         .type = MAIL_CACHE_FIELD_BITMASK,
+         .field_size = sizeof(uint32_t) },
+       { .name = "date.sent",
+         .type = MAIL_CACHE_FIELD_FIXED_SIZE,
+         .field_size = sizeof(struct mail_sent_date) },
+       { .name = "date.received",
+         .type = MAIL_CACHE_FIELD_FIXED_SIZE,
+         .field_size = sizeof(uint32_t) },
+       { .name = "date.save",
+         .type = MAIL_CACHE_FIELD_FIXED_SIZE,
+         .field_size = sizeof(uint32_t) },
+       { .name = "size.virtual",
+         .type = MAIL_CACHE_FIELD_FIXED_SIZE,
+         .field_size = sizeof(uoff_t) },
+       { .name = "size.physical",
+         .type = MAIL_CACHE_FIELD_FIXED_SIZE,
+         .field_size = sizeof(uoff_t) },
+       { .name = "imap.body",
+         .type = MAIL_CACHE_FIELD_STRING },
+       { .name = "imap.bodystructure",
+         .type = MAIL_CACHE_FIELD_STRING },
+       { .name = "imap.envelope",
+         .type = MAIL_CACHE_FIELD_STRING },
+       { .name = "pop3.uidl",
+         .type = MAIL_CACHE_FIELD_STRING },
+       { .name = "guid",
+         .type = MAIL_CACHE_FIELD_STRING },
+       { .name = "mime.parts",
+         .type = MAIL_CACHE_FIELD_VARIABLE_SIZE }
 };
 
 static int index_mail_parse_body(struct index_mail *mail,

diff --git a/src/lib-storage/mailbox-header.c b/src/lib-storage/mailbox-header.c
index 092936914eff53ab038efd740cb4cabac16b95a8..6a7dd8919667bf5940530db6a729b76c12b70e65 100644 (file)
--- a/src/lib-storage/mailbox-header.c
+++ b/src/lib-storage/mailbox-header.c
@@ -11,8 +11,8 @@ mailbox_header_lookup_init_real(struct mailbox *box,
                                const char *const headers[])
 {
        struct mail_cache_field *fields, header_field = {
-               NULL, 0, MAIL_CACHE_FIELD_HEADER, 0,
-               MAIL_CACHE_DECISION_TEMP
+               .type = MAIL_CACHE_FIELD_HEADER,
+               .decision = MAIL_CACHE_DECISION_TEMP
        };
        struct mailbox_header_lookup_ctx *ctx;
        const char *const *name;