dovecot-2.1: lib-storage: Code cleanup.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/ddfe3a0f75e6
changeset: 13826:ddfe3a0f75e6
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Dec 08 09:30:14 2011 +0200
description:
lib-storage: Code cleanup.

diffstat:

 src/lib-storage/index/index-mail-headers.c |   7 +--
 src/lib-storage/index/index-mail.c         |  47 +++++++++++++++++++----------
 src/lib-storage/mailbox-header.c           |   4 +-
 3 files changed, 35 insertions(+), 23 deletions(-)

diffs (89 lines):

diff -r d9acfebce2c9 -r ddfe3a0f75e6 src/lib-storage/index/index-mail-headers.c
--- a/src/lib-storage/index/index-mail-headers.c	Thu Dec 08 09:28:54 2011 +0200
+++ b/src/lib-storage/index/index-mail-headers.c	Thu Dec 08 09:30:14 2011 +0200
@@ -136,11 +136,10 @@
 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 -r d9acfebce2c9 -r ddfe3a0f75e6 src/lib-storage/index/index-mail.c
--- a/src/lib-storage/index/index-mail.c	Thu Dec 08 09:28:54 2011 +0200
+++ b/src/lib-storage/index/index-mail.c	Thu Dec 08 09:30:14 2011 +0200
@@ -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 -r d9acfebce2c9 -r ddfe3a0f75e6 src/lib-storage/mailbox-header.c
--- a/src/lib-storage/mailbox-header.c	Thu Dec 08 09:28:54 2011 +0200
+++ b/src/lib-storage/mailbox-header.c	Thu Dec 08 09:30:14 2011 +0200
@@ -11,8 +11,8 @@
 				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;