[dovecot-cvs] dovecot/src/lib-index mail-index-sync-update.c, 1.10,
1.11 mail-index-sync.c, 1.9, 1.10 mail-index-transaction.c,
1.2, 1.3 mail-index-view-sync.c, 1.4, 1.5 mail-index.h, 1.104,
1.105 mail-transaction-log.h, 1.5, 1.6
cras at procontrol.fi
cras at procontrol.fi
Sun May 2 23:32:18 EEST 2004
Update of /home/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv3311/lib-index
Modified Files:
mail-index-sync-update.c mail-index-sync.c
mail-index-transaction.c mail-index-view-sync.c mail-index.h
mail-transaction-log.h
Log Message:
s/custom flags/keywords/
Index: mail-index-sync-update.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-sync-update.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mail-index-sync-update.c 2 May 2004 19:24:35 -0000 1.10
+++ mail-index-sync-update.c 2 May 2004 20:32:16 -0000 1.11
@@ -63,16 +63,16 @@
{
struct mail_index_record *rec, *end;
uint8_t flag_mask, old_flags;
- custom_flags_mask_t custom_mask;
- int i, update_custom;
+ keywords_mask_t keyword_mask;
+ int i, update_keywords;
- update_custom = FALSE;
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
- if (syncrec->add_custom_flags[i] != 0)
- update_custom = TRUE;
- if (syncrec->remove_custom_flags[i] != 0)
- update_custom = TRUE;
- custom_mask[i] = ~syncrec->remove_custom_flags[i];
+ update_keywords = FALSE;
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++) {
+ if (syncrec->add_keywords[i] != 0)
+ update_keywords = TRUE;
+ if (syncrec->remove_keywords[i] != 0)
+ update_keywords = TRUE;
+ keyword_mask[i] = ~syncrec->remove_keywords[i];
}
flag_mask = ~syncrec->remove_flags;
@@ -81,11 +81,11 @@
for (; rec != end; rec++) {
old_flags = rec->flags;
rec->flags = (rec->flags & flag_mask) | syncrec->add_flags;
- if (update_custom) {
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
- rec->custom_flags[i] =
- (rec->custom_flags[i]&custom_mask[i]) |
- syncrec->add_custom_flags[i];
+ if (update_keywords) {
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++) {
+ rec->keywords[i] =
+ (rec->keywords[i] & keyword_mask[i]) |
+ syncrec->add_keywords[i];
}
}
Index: mail-index-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-sync.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mail-index-sync.c 2 May 2004 20:01:41 -0000 1.9
+++ mail-index-sync.c 2 May 2004 20:32:16 -0000 1.10
@@ -216,11 +216,11 @@
rec->seq2 = update->seq2;
rec->add_flags = update->add_flags;
- memcpy(rec->add_custom_flags, update->add_custom_flags,
- sizeof(rec->add_custom_flags));
+ memcpy(rec->add_keywords, update->add_keywords,
+ sizeof(rec->add_keywords));
rec->remove_flags = update->remove_flags;
- memcpy(rec->remove_custom_flags, update->remove_custom_flags,
- sizeof(rec->remove_custom_flags));
+ memcpy(rec->remove_keywords, update->remove_keywords,
+ sizeof(rec->remove_keywords));
}
static int mail_index_sync_rec_check(struct mail_index_view *view,
@@ -461,17 +461,15 @@
}
void mail_index_sync_flags_apply(const struct mail_index_sync_rec *sync_rec,
- uint8_t *flags,
- custom_flags_mask_t custom_flags)
+ uint8_t *flags, keywords_mask_t keywords)
{
int i;
i_assert(sync_rec->type == MAIL_INDEX_SYNC_TYPE_FLAGS);
*flags = (*flags & ~sync_rec->remove_flags) | sync_rec->add_flags;
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
- custom_flags[i] =
- (custom_flags[i] & ~sync_rec->remove_custom_flags[i]) |
- sync_rec->add_custom_flags[i];
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++) {
+ keywords[i] = (keywords[i] & ~sync_rec->remove_keywords[i]) |
+ sync_rec->add_keywords[i];
}
}
Index: mail-index-transaction.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-transaction.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mail-index-transaction.c 28 Apr 2004 00:21:00 -0000 1.2
+++ mail-index-transaction.c 2 May 2004 20:32:16 -0000 1.3
@@ -248,39 +248,37 @@
static void mail_index_record_modify_flags(struct mail_index_record *rec,
enum modify_type modify_type,
enum mail_flags flags,
- custom_flags_mask_t custom_flags)
+ keywords_mask_t keywords)
{
int i;
switch (modify_type) {
case MODIFY_REPLACE:
rec->flags = flags;
- memcpy(rec->custom_flags, custom_flags,
- INDEX_CUSTOM_FLAGS_BYTE_COUNT);
+ memcpy(rec->keywords, keywords, INDEX_KEYWORDS_BYTE_COUNT);
break;
case MODIFY_ADD:
rec->flags |= flags;
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++)
- rec->custom_flags[i] |= custom_flags[i];
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++)
+ rec->keywords[i] |= keywords[i];
break;
case MODIFY_REMOVE:
rec->flags &= ~flags;
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++)
- rec->custom_flags[i] &= ~custom_flags[i];
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++)
+ rec->keywords[i] &= ~keywords[i];
break;
}
}
-#define IS_COMPATIBLE_UPDATE(t, modify_type, flags, custom_flags) \
+#define IS_COMPATIBLE_UPDATE(t, modify_type, flags, keywords) \
((t)->last_update_modify_type == (modify_type) && \
(t)->last_update.add_flags == (flags) && \
- memcmp((t)->last_update.add_custom_flags, custom_flags, \
- INDEX_CUSTOM_FLAGS_BYTE_COUNT) == 0)
+ memcmp((t)->last_update.add_keywords, keywords, \
+ INDEX_KEYWORDS_BYTE_COUNT) == 0)
void mail_index_update_flags(struct mail_index_transaction *t, uint32_t seq,
enum modify_type modify_type,
- enum mail_flags flags,
- custom_flags_mask_t custom_flags)
+ enum mail_flags flags, keywords_mask_t keywords)
{
struct mail_index_record *rec;
size_t pos;
@@ -292,7 +290,7 @@
pos = (seq - t->first_new_seq) * sizeof(*rec);
rec = buffer_get_space_unsafe(t->appends, pos, sizeof(*rec));
mail_index_record_modify_flags(rec, modify_type,
- flags, custom_flags);
+ flags, keywords);
return;
}
@@ -303,13 +301,13 @@
transaction (eg. 1:10 +seen, 1:10 +deleted) */
if (t->last_update.seq2 == seq-1) {
if (t->last_update.seq1 != 0 &&
- IS_COMPATIBLE_UPDATE(t, modify_type, flags, custom_flags)) {
+ IS_COMPATIBLE_UPDATE(t, modify_type, flags, keywords)) {
t->last_update.seq2 = seq;
return;
}
} else if (t->last_update.seq1 == seq+1) {
if (t->last_update.seq1 != 0 &&
- IS_COMPATIBLE_UPDATE(t, modify_type, flags, custom_flags)) {
+ IS_COMPATIBLE_UPDATE(t, modify_type, flags, keywords)) {
t->last_update.seq1 = seq;
return;
}
@@ -321,8 +319,8 @@
t->last_update_modify_type = modify_type;
t->last_update.seq1 = t->last_update.seq2 = seq;
t->last_update.add_flags = flags;
- memcpy(t->last_update.add_custom_flags, custom_flags,
- INDEX_CUSTOM_FLAGS_BYTE_COUNT);
+ memcpy(t->last_update.add_keywords, keywords,
+ INDEX_KEYWORDS_BYTE_COUNT);
}
static void
@@ -337,10 +335,8 @@
/* remove_flags = ~add_flags */
update->remove_flags =
~update->add_flags & MAIL_INDEX_FLAGS_MASK;
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
- update->remove_custom_flags[i] =
- ~update->add_custom_flags[i];
- }
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++)
+ update->remove_keywords[i] = ~update->add_keywords[i];
break;
case MODIFY_ADD:
/* already in add_flags */
@@ -348,11 +344,10 @@
case MODIFY_REMOVE:
/* add_flags -> remove_flags */
update->remove_flags = update->add_flags;
- memcpy(&update->remove_custom_flags, &update->add_custom_flags,
- INDEX_CUSTOM_FLAGS_BYTE_COUNT);
+ memcpy(&update->remove_keywords, &update->add_keywords,
+ INDEX_KEYWORDS_BYTE_COUNT);
update->add_flags = 0;
- memset(&update->add_custom_flags, 0,
- INDEX_CUSTOM_FLAGS_BYTE_COUNT);
+ memset(&update->add_keywords, 0, INDEX_KEYWORDS_BYTE_COUNT);
break;
}
}
Index: mail-index-view-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-view-sync.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mail-index-view-sync.c 1 May 2004 15:32:24 -0000 1.4
+++ mail-index-view-sync.c 2 May 2004 20:32:16 -0000 1.5
@@ -181,11 +181,9 @@
old_flags = rec->flags;
rec->flags = (rec->flags & ~u->remove_flags) | u->add_flags;
- for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
- rec->custom_flags[i] =
- (rec->custom_flags[i] &
- ~u->remove_custom_flags[i]) |
- u->add_custom_flags[i];
+ for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++) {
+ rec->keywords[i] = u->add_keywords[i] |
+ (rec->keywords[i] & ~u->remove_keywords[i]);
}
mail_index_header_update_counts(&map->hdr_copy, old_flags,
Index: mail-index.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- mail-index.h 2 May 2004 19:24:35 -0000 1.104
+++ mail-index.h 2 May 2004 20:32:16 -0000 1.105
@@ -8,9 +8,9 @@
#define MAIL_INDEX_HEADER_MIN_SIZE 68
-/* Number of custom flags in mail_index_record. */
-#define INDEX_CUSTOM_FLAGS_COUNT (3*8)
-#define INDEX_CUSTOM_FLAGS_BYTE_COUNT ((INDEX_CUSTOM_FLAGS_COUNT*7)/8)
+/* Number of keywords in mail_index_record. */
+#define INDEX_KEYWORDS_COUNT (3*8)
+#define INDEX_KEYWORDS_BYTE_COUNT ((INDEX_KEYWORDS_COUNT*7)/8)
enum mail_index_open_flags {
/* Create index if it doesn't exist */
@@ -54,7 +54,7 @@
#define MAIL_INDEX_FLAGS_MASK \
(MAIL_ANSWERED | MAIL_FLAGGED | MAIL_DELETED | MAIL_SEEN | MAIL_DRAFT)
-typedef unsigned char custom_flags_mask_t[INDEX_CUSTOM_FLAGS_BYTE_COUNT];
+typedef unsigned char keywords_mask_t[INDEX_KEYWORDS_BYTE_COUNT];
struct mail_index_header {
/* major version is increased only when you can't have backwards
@@ -97,7 +97,7 @@
struct mail_index_record {
uint32_t uid;
uint8_t flags; /* mail_flags | mail_index_mail_flags */
- custom_flags_mask_t custom_flags;
+ keywords_mask_t keywords;
uint32_t cache_offset;
};
@@ -114,9 +114,9 @@
/* MAIL_INDEX_SYNC_TYPE_FLAGS: */
uint8_t add_flags;
- custom_flags_mask_t add_custom_flags;
+ keywords_mask_t add_keywords;
uint8_t remove_flags;
- custom_flags_mask_t remove_custom_flags;
+ keywords_mask_t remove_keywords;
/* MAIL_INDEX_SYNC_TYPE_APPEND: */
const struct mail_index_record *appends;
@@ -255,8 +255,7 @@
/* Update flags in index. */
void mail_index_update_flags(struct mail_index_transaction *t, uint32_t seq,
enum modify_type modify_type,
- enum mail_flags flags,
- custom_flags_mask_t custom_flags);
+ enum mail_flags flags, keywords_mask_t keywords);
/* Returns the last error code. */
enum mail_index_error mail_index_get_last_error(struct mail_index *index);
@@ -272,7 +271,6 @@
/* Apply changes in MAIL_INDEX_SYNC_TYPE_FLAGS typed sync records to given
flags variables. */
void mail_index_sync_flags_apply(const struct mail_index_sync_rec *sync_rec,
- uint8_t *flags,
- custom_flags_mask_t custom_flags);
+ uint8_t *flags, keywords_mask_t keywords);
#endif
Index: mail-transaction-log.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-transaction-log.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mail-transaction-log.h 1 May 2004 16:08:15 -0000 1.5
+++ mail-transaction-log.h 2 May 2004 20:32:16 -0000 1.6
@@ -48,9 +48,9 @@
struct mail_transaction_flag_update {
uint32_t seq1, seq2;
uint8_t add_flags;
- custom_flags_mask_t add_custom_flags;
+ keywords_mask_t add_keywords;
uint8_t remove_flags;
- custom_flags_mask_t remove_custom_flags;
+ keywords_mask_t remove_keywords;
};
struct mail_transaction_log *
More information about the dovecot-cvs
mailing list