[dovecot-cvs] dovecot/src/lib-storage/index index-fetch.h, 1.15, 1.16 index-mail.c, 1.28, 1.29 index-search.c, 1.85, 1.86 index-status.c, 1.29, 1.30 index-storage.c, 1.45, 1.46 index-storage.h, 1.57, 1.58

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv3311/lib-storage/index

Modified Files:
	index-fetch.h index-mail.c index-search.c index-status.c 
	index-storage.c index-storage.h 
Log Message:
s/custom flags/keywords/



Index: index-fetch.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-fetch.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- index-fetch.h	20 Jan 2003 14:52:51 -0000	1.15
+++ index-fetch.h	2 May 2004 20:32:16 -0000	1.16
@@ -7,8 +7,8 @@
 	struct imap_message_cache *cache;
 	struct mail_index *index;
 
-	const char **custom_flags;
-	unsigned int custom_flags_count;
+	const char **keywords;
+	unsigned int keywords_count;
 
 	//struct mail_fetch_data *fetch_data;
 	struct ostream *output;

Index: index-mail.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- index-mail.c	2 May 2004 19:24:35 -0000	1.28
+++ index-mail.c	2 May 2004 20:32:16 -0000	1.29
@@ -170,9 +170,9 @@
 	struct index_mail_data *data = &mail->data;
 
 	data->flags.flags = data->rec->flags;
-	/*FIXME:data->flags.custom_flags =
-		mail_custom_flags_list_get(mail->ibox->index->custom_flags);
-	data->flags.custom_flags_count = MAIL_CUSTOM_FLAGS_COUNT;*/
+	/*FIXME:data->flags.keywords =
+		mail_keywords_list_get(mail->ibox->index->keywords);
+	data->flags.keywords_count = MAIL_KEYWORDS_COUNT;*/
 
 	return &data->flags;
 }
@@ -624,24 +624,24 @@
 {
 	struct index_mail *imail = (struct index_mail *)mail;
 	enum mail_flags modify_flags;
-	custom_flags_mask_t custom_flags;
+	keywords_mask_t keywords;
 
 	/* \Recent can't be changed */
 	modify_flags = flags->flags & ~MAIL_RECENT;
 
-	/*if (!index_mailbox_fix_custom_flags(ibox, &modify_flags,
-					    flags->custom_flags,
-					    flags->custom_flags_count))
+	/*if (!index_mailbox_fix_keywords(ibox, &modify_flags,
+					    flags->keywords,
+					    flags->keywords_count))
 		return FALSE;*/
 
-	memset(custom_flags, 0, sizeof(custom_flags));
+	memset(keywords, 0, sizeof(keywords));
 	mail_index_update_flags(imail->trans->trans, mail->seq, modify_type,
-				flags->flags, custom_flags);
+				flags->flags, keywords);
 
-	/*if (mail_custom_flags_has_changes(ibox->index->custom_flags)) {
-		storage->callbacks->new_custom_flags(&ibox->box,
-			mail_custom_flags_list_get(ibox->index->custom_flags),
-			MAIL_CUSTOM_FLAGS_COUNT, storage->callback_context);
+	/*if (mail_keywords_has_changes(ibox->index->keywords)) {
+		storage->callbacks->new_keywords(&ibox->box,
+			mail_keywords_list_get(ibox->index->keywords),
+			MAIL_KEYWORDS_COUNT, storage->callback_context);
 	}*/
 
 	return 0;

Index: index-search.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-search.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- index-search.c	1 May 2004 18:30:52 -0000	1.85
+++ index-search.c	2 May 2004 20:32:16 -0000	1.86
@@ -83,23 +83,23 @@
 			  const struct mail_index_record *rec,
 			  const char *value)
 {
-	const char **custom_flags;
+	const char **keywords;
 	int i;
 
-	for (i = 0; i < INDEX_CUSTOM_FLAGS_BYTE_COUNT; i++) {
-		if (rec->custom_flags[i] != 0)
+	for (i = 0; i < INDEX_KEYWORDS_BYTE_COUNT; i++) {
+		if (rec->keywords[i] != 0)
 			break;
 	}
 
-	if (i == INDEX_CUSTOM_FLAGS_BYTE_COUNT)
-		return FALSE; /* no custom flags set */
+	if (i == INDEX_KEYWORDS_BYTE_COUNT)
+		return FALSE; /* no keywords set */
 
-	/*FIXME:custom_flags = mail_custom_flags_list_get(index->custom_flags);
-	for (i = 0; i < MAIL_CUSTOM_FLAGS_COUNT; i++) {
-		if (custom_flags[i] != NULL &&
-		    strcasecmp(custom_flags[i], value) == 0) {
+	/*FIXME:keywords = mail_keywords_list_get(index->keywords);
+	for (i = 0; i < MAIL_KEYWORDS_COUNT; i++) {
+		if (keywords[i] != NULL &&
+		    strcasecmp(keywords[i], value) == 0) {
 			return rec->msg_flags &
-				(1 << (MAIL_CUSTOM_FLAG_1_BIT+i));
+				(1 << (MAIL_KEYWORD_1_BIT+i));
 		}
 	}*/
 

Index: index-status.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-status.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- index-status.c	1 May 2004 18:30:52 -0000	1.29
+++ index-status.c	2 May 2004 20:32:16 -0000	1.30
@@ -8,17 +8,17 @@
 	 STATUS_UIDVALIDITY | STATUS_UNSEEN | STATUS_FIRST_UNSEEN_SEQ)
 
 /*static void
-get_custom_flags(struct mail_custom_flags *mcf, struct mailbox_status *status)
+get_keywords(struct mail_keywords *mcf, struct mailbox_status *status)
 {
 	const char **flags;
 	unsigned int i;
 
-	status->custom_flags_count = MAIL_CUSTOM_FLAGS_COUNT;
-	status->custom_flags = t_new(const char *, MAIL_CUSTOM_FLAGS_COUNT);
+	status->keywords_count = MAIL_KEYWORDS_COUNT;
+	status->keywords = t_new(const char *, MAIL_KEYWORDS_COUNT);
 
-	flags = mail_custom_flags_list_get(mcf);
-	for (i = 0; i < MAIL_CUSTOM_FLAGS_COUNT; i++)
-		status->custom_flags[i] = t_strdup(flags[i]);
+	flags = mail_keywords_list_get(mcf);
+	for (i = 0; i < MAIL_KEYWORDS_COUNT; i++)
+		status->keywords[i] = t_strdup(flags[i]);
 }*/
 
 int index_storage_get_status(struct mailbox *box,
@@ -58,8 +58,8 @@
 	if ((items & STATUS_RECENT) != 0)
 		status->recent = ibox->get_recent_count(ibox);
 
-	/*FIXME:if (items & STATUS_CUSTOM_FLAGS)
-		get_custom_flags(ibox, status);*/
+	/*FIXME:if (items & STATUS_KEYWORDS)
+		get_keywords(ibox, status);*/
 
 	mail_index_view_unlock(ibox->view);
 	return 0;

Index: index-storage.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-storage.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- index-storage.c	28 Apr 2004 20:51:22 -0000	1.45
+++ index-storage.c	2 May 2004 20:32:16 -0000	1.46
@@ -383,7 +383,7 @@
 	return ibox->readonly;
 }
 
-int index_storage_allow_new_custom_flags(struct mailbox *box)
+int index_storage_allow_new_keywords(struct mailbox *box)
 {
 	struct index_mailbox *ibox = (struct index_mailbox *) box;
 
@@ -426,22 +426,21 @@
 	return FALSE;
 }
 
-int index_mailbox_fix_custom_flags(struct index_mailbox *ibox,
-				   enum mail_flags *flags,
-				   const char *custom_flags[],
-				   unsigned int custom_flags_count)
+int index_mailbox_fix_keywords(struct index_mailbox *ibox,
+			       enum mail_flags *flags,
+			       const char *keywords[],
+			       unsigned int keywords_count)
 {
 	/*FIXME:int ret;
 
-	ret = mail_custom_flags_fix_list(ibox->index,
-					 flags, custom_flags,
-					 custom_flags_count);
+	ret = mail_keywords_fix_list(ibox->index, flags, keywords,
+				     keywords_count);
 	switch (ret) {
 	case 1:
 		return TRUE;
 	case 0:
 		mail_storage_set_error(ibox->box.storage,
-			"Maximum number of different custom flags exceeded");
+			"Maximum number of different keywords exceeded");
 		return FALSE;
 	default:
 		return mail_storage_set_index_error(ibox);

Index: index-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-storage.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- index-storage.h	2 May 2004 18:42:28 -0000	1.57
+++ index-storage.h	2 May 2004 20:32:16 -0000	1.58
@@ -117,13 +117,13 @@
 void index_storage_mailbox_free(struct mailbox *box);
 
 int index_storage_is_readonly(struct mailbox *box);
-int index_storage_allow_new_custom_flags(struct mailbox *box);
+int index_storage_allow_new_keywords(struct mailbox *box);
 int index_storage_is_inconsistent(struct mailbox *box);
 
-int index_mailbox_fix_custom_flags(struct index_mailbox *ibox,
-				   enum mail_flags *flags,
-				   const char *custom_flags[],
-				   unsigned int custom_flags_count);
+int index_mailbox_fix_keywords(struct index_mailbox *ibox,
+			       enum mail_flags *flags,
+			       const char *keywords[],
+			       unsigned int keywords_count);
 
 unsigned int index_storage_get_recent_count(struct mail_index_view *view);