Removed MAILBOX_GUID_SIZE macro, use MAIL_GUID_128_SIZE everywhere.

They were required to be the same size anyway.

--HG--
branch : HEAD

diff --git a/src/dsync/dsync-data.h b/src/dsync/dsync-data.h
index 05122ea7a071f6f605dacd992f441886ca5aa624..64bbdd9b35bbe837c6b595495ce31b8c8454130c 100644 (file)
--- a/src/dsync/dsync-data.h
+++ b/src/dsync/dsync-data.h
@@ -4,7 +4,7 @@
 #include "mail-storage.h"
 
 typedef struct {
-       uint8_t guid[MAILBOX_GUID_SIZE];
+       uint8_t guid[MAIL_GUID_128_SIZE];
 } mailbox_guid_t;
 ARRAY_DEFINE_TYPE(mailbox_guid, mailbox_guid_t);
 

diff --git a/src/dsync/test-dsync-common.c b/src/dsync/test-dsync-common.c
index be4a1b144f8fed67f298df912585f1536259d4d6..92f6660b8af3798b5872095d707793e5982364e5 100644 (file)
--- a/src/dsync/test-dsync-common.c
+++ b/src/dsync/test-dsync-common.c
@@ -5,12 +5,12 @@
 #include "dsync-data.h"
 #include "test-dsync-common.h"
 
-const uint8_t test_mailbox_guid1[MAILBOX_GUID_SIZE] = {
+const uint8_t test_mailbox_guid1[MAIL_GUID_128_SIZE] = {
        0x12, 0x34, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
        0x21, 0x43, 0x54, 0x76, 0x98, 0xba, 0xdc, 0xfe
 };
 
-const uint8_t test_mailbox_guid2[MAILBOX_GUID_SIZE] = {
+const uint8_t test_mailbox_guid2[MAIL_GUID_128_SIZE] = {
        0xa3, 0xbd, 0x78, 0x24, 0xde, 0xfe, 0x08, 0xf7,
        0xac, 0xc7, 0xca, 0x8c, 0xe7, 0x39, 0xdb, 0xca
 };

diff --git a/src/dsync/test-dsync-common.h b/src/dsync/test-dsync-common.h
index 710b0af459d456602416f78fe0c0be6d451af399..0a8b071cb82ac298c6ca68b7bd6418900b5cc32f 100644 (file)
--- a/src/dsync/test-dsync-common.h
+++ b/src/dsync/test-dsync-common.h
@@ -7,8 +7,8 @@
 #define TEST_MAILBOX_GUID1 "1234456789abcdef2143547698badcfe"
 #define TEST_MAILBOX_GUID2 "a3bd7824defe08f7acc7ca8ce739dbca"
 
-extern const uint8_t test_mailbox_guid1[MAILBOX_GUID_SIZE];
-extern const uint8_t test_mailbox_guid2[MAILBOX_GUID_SIZE];
+extern const uint8_t test_mailbox_guid1[MAIL_GUID_128_SIZE];
+extern const uint8_t test_mailbox_guid2[MAIL_GUID_128_SIZE];
 
 bool dsync_messages_equal(const struct dsync_message *m1,
                          const struct dsync_message *m2);

diff --git a/src/dsync/test-dsync-proxy-server-cmd.c b/src/dsync/test-dsync-proxy-server-cmd.c
index 37836de6a0c38a8a3f2499b71e1c8696a6ec2386..46ec132fd30f5aaeeda9138adc198a0921a503a6 100644 (file)
--- a/src/dsync/test-dsync-proxy-server-cmd.c
+++ b/src/dsync/test-dsync-proxy-server-cmd.c
@@ -170,7 +170,7 @@ static void test_dsync_proxy_box_create(void)
        test_assert(test_dsync_worker_next_box_event(test_worker, &event));
        test_assert(event.type == LAST_BOX_TYPE_CREATE);
        test_assert(strcmp(event.box.name, "selectable") == 0);
-       test_assert(memcmp(event.box.guid.guid, test_mailbox_guid1, MAILBOX_GUID_SIZE) == 0);
+       test_assert(memcmp(event.box.guid.guid, test_mailbox_guid1, MAIL_GUID_128_SIZE) == 0);
        test_assert(event.box.uid_validity == 1234567890);
        test_assert(event.box.uid_next == 9876);
        test_assert(event.box.highest_modseq == 28427847284728);
@@ -189,7 +189,7 @@ static void test_dsync_proxy_box_update(void)
        test_assert(test_dsync_worker_next_box_event(test_worker, &event));
        test_assert(event.type == LAST_BOX_TYPE_UPDATE);
        test_assert(strcmp(event.box.name, "updated") == 0);
-       test_assert(memcmp(event.box.guid.guid, test_mailbox_guid2, MAILBOX_GUID_SIZE) == 0);
+       test_assert(memcmp(event.box.guid.guid, test_mailbox_guid2, MAIL_GUID_128_SIZE) == 0);
        test_assert(event.box.uid_validity == 34343);
        test_assert(event.box.uid_next == 22);
        test_assert(event.box.highest_modseq == 2238427847284728);
@@ -202,10 +202,10 @@ static void test_dsync_proxy_box_select(void)
        test_begin("proxy server box select");
 
        test_assert(run_cmd("BOX-SELECT", TEST_MAILBOX_GUID1, NULL) == 1);
-       test_assert(memcmp(test_worker->selected_mailbox.guid, test_mailbox_guid1, MAILBOX_GUID_SIZE) == 0);
+       test_assert(memcmp(test_worker->selected_mailbox.guid, test_mailbox_guid1, MAIL_GUID_128_SIZE) == 0);
 
        test_assert(run_cmd("BOX-SELECT", TEST_MAILBOX_GUID2, NULL) == 1);
-       test_assert(memcmp(test_worker->selected_mailbox.guid, test_mailbox_guid2, MAILBOX_GUID_SIZE) == 0);
+       test_assert(memcmp(test_worker->selected_mailbox.guid, test_mailbox_guid2, MAIL_GUID_128_SIZE) == 0);
 
        test_end();
 }
@@ -270,7 +270,7 @@ static void test_dsync_proxy_msg_copy(void)
                            "8294284", NULL) == 1);
        test_assert(test_dsync_worker_next_msg_event(test_worker, &msg_event));
        test_assert(msg_event.type == LAST_MSG_TYPE_COPY);
-       test_assert(memcmp(msg_event.copy_src_mailbox.guid, test_mailbox_guid1, MAILBOX_GUID_SIZE) == 0);
+       test_assert(memcmp(msg_event.copy_src_mailbox.guid, test_mailbox_guid1, MAIL_GUID_128_SIZE) == 0);
        test_assert(msg_event.copy_src_uid == 5454);
        test_assert(strcmp(msg_event.msg.guid, "copyguid") == 0);
        test_assert(msg_event.msg.uid == 5678);

diff --git a/src/lib-storage/index/dbox/dbox-storage.h b/src/lib-storage/index/dbox/dbox-storage.h
index 2b671e2039d05b1a43559cd81205f7d90b455254..2574f51b50b4bd755437f23a7711d9677b426994 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-storage.h
+++ b/src/lib-storage/index/dbox/dbox-storage.h
@@ -33,7 +33,7 @@
 struct dbox_index_header {
        uint32_t map_uid_validity;
        uint32_t highest_maildir_uid;
-       uint8_t mailbox_guid[MAILBOX_GUID_SIZE];
+       uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
 };
 
 struct dbox_storage {

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c
index 42a61ab6f1e0c777ac268ba3d736a87ce9cfe61a..ebe86cf12f13885e494abd017a74a7e15e5a3832 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-uidlist.c
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c
@@ -91,7 +91,7 @@ struct maildir_uidlist {
        uoff_t last_read_offset;
        string_t *hdr_extensions;
 
-       uint8_t mailbox_guid[MAILBOX_GUID_SIZE];
+       uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
 
        unsigned int recreate:1;
        unsigned int initial_read:1;
@@ -592,9 +592,9 @@ maildir_uidlist_read_v3_header(struct maildir_uidlist *uidlist,
                        break;
                case MAILDIR_UIDLIST_HDR_EXT_GUID:
                        buf = buffer_create_dynamic(pool_datastack_create(),
-                                                   MAILBOX_GUID_SIZE);
+                                                   MAIL_GUID_128_SIZE);
                        if (hex_to_binary(value, buf) < 0 ||
-                           buf->used != MAILBOX_GUID_SIZE) {
+                           buf->used != MAIL_GUID_128_SIZE) {
                                maildir_uidlist_set_corrupted(uidlist,
                                        "Invalid mailbox GUID: %s", value);
                                return -1;
@@ -1086,19 +1086,19 @@ uint32_t maildir_uidlist_get_next_uid(struct maildir_uidlist *uidlist)
 }
 
 int maildir_uidlist_get_mailbox_guid(struct maildir_uidlist *uidlist,
-                                    uint8_t mailbox_guid[MAILBOX_GUID_SIZE])
+                                    uint8_t mailbox_guid[MAIL_GUID_128_SIZE])
 {
        if (!uidlist->have_mailbox_guid) {
                uidlist->recreate = TRUE;
                if (maildir_uidlist_update(uidlist) < 0)
                        return -1;
        }
-       memcpy(mailbox_guid, uidlist->mailbox_guid, MAILBOX_GUID_SIZE);
+       memcpy(mailbox_guid, uidlist->mailbox_guid, MAIL_GUID_128_SIZE);
        return 0;
 }
 
 void maildir_uidlist_set_mailbox_guid(struct maildir_uidlist *uidlist,
-                                     const uint8_t mailbox_guid[MAILBOX_GUID_SIZE])
+                                     const uint8_t mailbox_guid[MAIL_GUID_128_SIZE])
 {
        if (memcmp(uidlist->mailbox_guid, mailbox_guid,
                   sizeof(uidlist->mailbox_guid)) != 0) {

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.h b/src/lib-storage/index/maildir/maildir-uidlist.h
index 67df1a8c1c5a9597ab098e187c73809453cb511b..95b527aaabd283c9a464c6a228f0b26c893a6b6e 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-uidlist.h
+++ b/src/lib-storage/index/maildir/maildir-uidlist.h
@@ -83,9 +83,9 @@ maildir_uidlist_lookup_ext(struct maildir_uidlist *uidlist, uint32_t uid,
 uint32_t maildir_uidlist_get_uid_validity(struct maildir_uidlist *uidlist);
 uint32_t maildir_uidlist_get_next_uid(struct maildir_uidlist *uidlist);
 int maildir_uidlist_get_mailbox_guid(struct maildir_uidlist *uidlist,
-                                    uint8_t mailbox_guid[MAILBOX_GUID_SIZE]);
+                                    uint8_t mailbox_guid[MAIL_GUID_128_SIZE]);
 void maildir_uidlist_set_mailbox_guid(struct maildir_uidlist *uidlist,
-                                     const uint8_t mailbox_guid[MAILBOX_GUID_SIZE]);
+                                     const uint8_t mailbox_guid[MAIL_GUID_128_SIZE]);
 
 void maildir_uidlist_set_uid_validity(struct maildir_uidlist *uidlist,
                                      uint32_t uid_validity);

diff --git a/src/lib-storage/index/mbox/mbox-storage.h b/src/lib-storage/index/mbox/mbox-storage.h
index 8571728e5192ba55deb41fb4a78150f3a6ac0742..09481397eddfab73103bbe1c66e932aecc5d16d9 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.h
+++ b/src/lib-storage/index/mbox/mbox-storage.h
@@ -20,7 +20,7 @@ struct mbox_index_header {
        uint32_t sync_mtime;
        uint8_t dirty_flag;
        uint8_t unused[3];
-       uint8_t mailbox_guid[MAILBOX_GUID_SIZE];
+       uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
 };
 struct mbox_storage {
        struct mail_storage storage;

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 3ef45a0e1b63a6cefa626bca6c8d7615144907b4..95581239010f6f49ec8d9df15e06daf80c7d4d09 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -434,6 +434,6 @@ void mail_generate_guid_128(uint8_t guid[MAIL_GUID_128_SIZE]);
 int mail_set_aborted(struct mail *mail);
 void mail_set_expunged(struct mail *mail);
 void mailbox_set_deleted(struct mailbox *box);
-bool mailbox_guid_is_empty(const uint8_t guid[MAILBOX_GUID_SIZE]);
+bool mailbox_guid_is_empty(const uint8_t guid[MAIL_GUID_128_SIZE]);
 
 #endif

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 0c7f40c5f8d92a1b543a65194f65f6aed4c8c894..20ab12ee5e08d5cc89fab14329e938507104a423 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1093,7 +1093,7 @@ void mailbox_set_deleted(struct mailbox *box)
        box->mailbox_deleted = TRUE;
 }
 
-bool mailbox_guid_is_empty(const uint8_t guid[MAILBOX_GUID_SIZE])
+bool mailbox_guid_is_empty(const uint8_t guid[MAIL_GUID_128_SIZE])
 {
        return mail_guid_128_is_empty(guid);
 }

diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 6466371d4c2eeac31e6d2035f41dcce23a697a18..ba83b4476672b6f2cb96833e08a2d998cb49b014 100644 (file)
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -170,7 +170,6 @@ struct mail_save_context;
 struct mailbox;
 struct mailbox_transaction_context;
 
-#define MAILBOX_GUID_SIZE MAIL_GUID_128_SIZE
 struct mailbox_status {
        uint32_t messages;
        uint32_t recent;
@@ -181,7 +180,7 @@ struct mailbox_status {
 
        uint32_t first_unseen_seq;
        uint64_t highest_modseq;
-       uint8_t mailbox_guid[MAILBOX_GUID_SIZE];
+       uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
 
        const ARRAY_TYPE(keywords) *keywords;
 
@@ -193,7 +192,7 @@ struct mailbox_status {
 
 struct mailbox_update {
        /* All non-zero fields are changed. */
-       uint8_t mailbox_guid[MAILBOX_GUID_SIZE];
+       uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
        uint32_t uid_validity;
        uint32_t min_next_uid;
        uint64_t min_highest_modseq;

diff --git a/src/lib-storage/mail.c b/src/lib-storage/mail.c
index 5dc55ff6074f2ae80c76fbd0876f8e7ede80b055..fc947a4d1654a1bf70f4e5246ff4e5c62026bf31 100644 (file)
--- a/src/lib-storage/mail.c
+++ b/src/lib-storage/mail.c
@@ -320,7 +320,7 @@ bool mail_guid_128_is_empty(const uint8_t guid_128[MAIL_GUID_128_SIZE])
 {
        unsigned int i;
 
-       for (i = 0; i < MAILBOX_GUID_SIZE; i++) {
+       for (i = 0; i < MAIL_GUID_128_SIZE; i++) {
                if (guid_128[i] != 0)
                        return FALSE;
        }