dovecot-2.0: Removed MAILBOX_GUID_SIZE macro, use MAIL_GUID_128_...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Jul 30 00:45:44 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/9e3e3166a5c9
changeset: 9694:9e3e3166a5c9
user: Timo Sirainen <tss at iki.fi>
date: Wed Jul 29 17:45:36 2009 -0400
description:
Removed MAILBOX_GUID_SIZE macro, use MAIL_GUID_128_SIZE everywhere.
They were required to be the same size anyway.
diffstat:
12 files changed, 25 insertions(+), 26 deletions(-)
src/dsync/dsync-data.h | 2 +-
src/dsync/test-dsync-common.c | 4 ++--
src/dsync/test-dsync-common.h | 4 ++--
src/dsync/test-dsync-proxy-server-cmd.c | 10 +++++-----
src/lib-storage/index/dbox/dbox-storage.h | 2 +-
src/lib-storage/index/maildir/maildir-uidlist.c | 12 ++++++------
src/lib-storage/index/maildir/maildir-uidlist.h | 4 ++--
src/lib-storage/index/mbox/mbox-storage.h | 2 +-
src/lib-storage/mail-storage-private.h | 2 +-
src/lib-storage/mail-storage.c | 2 +-
src/lib-storage/mail-storage.h | 5 ++---
src/lib-storage/mail.c | 2 +-
diffs (237 lines):
diff -r 03b52be4da81 -r 9e3e3166a5c9 src/dsync/dsync-data.h
--- a/src/dsync/dsync-data.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/dsync/dsync-data.h Wed Jul 29 17:45:36 2009 -0400
@@ -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 -r 03b52be4da81 -r 9e3e3166a5c9 src/dsync/test-dsync-common.c
--- a/src/dsync/test-dsync-common.c Wed Jul 29 16:20:17 2009 -0400
+++ b/src/dsync/test-dsync-common.c Wed Jul 29 17:45:36 2009 -0400
@@ -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 -r 03b52be4da81 -r 9e3e3166a5c9 src/dsync/test-dsync-common.h
--- a/src/dsync/test-dsync-common.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/dsync/test-dsync-common.h Wed Jul 29 17:45:36 2009 -0400
@@ -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 -r 03b52be4da81 -r 9e3e3166a5c9 src/dsync/test-dsync-proxy-server-cmd.c
--- a/src/dsync/test-dsync-proxy-server-cmd.c Wed Jul 29 16:20:17 2009 -0400
+++ b/src/dsync/test-dsync-proxy-server-cmd.c Wed Jul 29 17:45:36 2009 -0400
@@ -170,7 +170,7 @@ static void test_dsync_proxy_box_create(
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(
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(
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(vo
"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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/index/dbox/dbox-storage.h
--- a/src/lib-storage/index/dbox/dbox-storage.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-storage.h Wed Jul 29 17:45:36 2009 -0400
@@ -33,7 +33,7 @@ struct dbox_index_header {
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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/index/maildir/maildir-uidlist.c
--- a/src/lib-storage/index/maildir/maildir-uidlist.c Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c Wed Jul 29 17:45:36 2009 -0400
@@ -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 ma
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(st
}
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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/index/maildir/maildir-uidlist.h
--- a/src/lib-storage/index/maildir/maildir-uidlist.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-uidlist.h Wed Jul 29 17:45:36 2009 -0400
@@ -83,9 +83,9 @@ uint32_t maildir_uidlist_get_uid_validit
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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/index/mbox/mbox-storage.h
--- a/src/lib-storage/index/mbox/mbox-storage.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/index/mbox/mbox-storage.h Wed Jul 29 17:45:36 2009 -0400
@@ -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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/mail-storage-private.h Wed Jul 29 17:45:36 2009 -0400
@@ -434,6 +434,6 @@ int mail_set_aborted(struct mail *mail);
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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/mail-storage.c Wed Jul 29 17:45:36 2009 -0400
@@ -1093,7 +1093,7 @@ void mailbox_set_deleted(struct mailbox
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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/mail-storage.h
--- a/src/lib-storage/mail-storage.h Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/mail-storage.h Wed Jul 29 17:45:36 2009 -0400
@@ -170,7 +170,6 @@ struct mailbox;
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 -r 03b52be4da81 -r 9e3e3166a5c9 src/lib-storage/mail.c
--- a/src/lib-storage/mail.c Wed Jul 29 16:20:17 2009 -0400
+++ b/src/lib-storage/mail.c Wed Jul 29 17:45:36 2009 -0400
@@ -320,7 +320,7 @@ bool mail_guid_128_is_empty(const uint8_
{
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;
}
More information about the dovecot-cvs
mailing list