From: Timo Sirainen <tss@iki.fi>
Date: Thu, 23 Sep 2010 17:02:20 +0000 (+0100)
Subject: maildir: Code cleanup: Use MAILDIR_UIDLIST_HDR_EXT_* when building the header string.
X-Git-Tag: 2.0.4~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cc8a792108e1c115c1c6c9eb61746b31f0205db;p=thirdparty%2Fdovecot%2Fcore.git

maildir: Code cleanup: Use MAILDIR_UIDLIST_HDR_EXT_* when building the header string.
---

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c
index a8166cac9f..e4edddb28a 100644
--- a/src/lib-storage/index/maildir/maildir-uidlist.c
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c
@@ -1248,8 +1248,12 @@ static int maildir_uidlist_write_fd(struct maildir_uidlist *uidlist, int fd,
 			mail_generate_guid_128(uidlist->mailbox_guid);
 
 		i_assert(uidlist->next_uid > 0);
-		str_printfa(str, "%u V%u N%u G%s", uidlist->version,
-			    uidlist->uid_validity, uidlist->next_uid,
+		str_printfa(str, "%u %c%u %c%u %c%s", uidlist->version,
+			    MAILDIR_UIDLIST_HDR_EXT_UID_VALIDITY,
+			    uidlist->uid_validity,
+			    MAILDIR_UIDLIST_HDR_EXT_NEXT_UID,
+			    uidlist->next_uid,
+			    MAILDIR_UIDLIST_HDR_EXT_GUID,
 			    binary_to_hex(uidlist->mailbox_guid,
 					  sizeof(uidlist->mailbox_guid)));
 		if (str_len(uidlist->hdr_extensions) > 0) {