Mercurial > dovecot > original-hg > dovecot-1.2

changeset 8547:545cb188f7ab HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced literal "keywords" strings with a macro.
author Timo Sirainen <tss@iki.fi>
date Sun, 14 Dec 2008 06:38:24 +0200
parents 50f49805b13b
children 6a6a3bfea547
files src/lib-index/mail-index-fsck.c src/lib-index/mail-index-map.c src/lib-index/mail-index-private.h src/lib-index/mail-index-sync-ext.c src/lib-index/mail-index-sync-keywords.c src/lib-index/mail-index.c src/util/idxview.c
diffstat 7 files changed, 25 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-index-fsck.c	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/lib-index/mail-index-fsck.c	Sun Dec 14 06:38:24 2008 +0200
@@ -143,7 +143,7 @@
 	bool changed = FALSE;
 
 	hdr_offset = ext_offset +
-		mail_index_map_ext_hdr_offset(sizeof("keywords")-1);
+		mail_index_map_ext_hdr_offset(sizeof(MAIL_INDEX_EXT_KEYWORDS)-1);
 	kw_hdr = CONST_PTR_OFFSET(map->hdr_base, hdr_offset);
 	keywords_count = kw_hdr->keywords_count;
 
@@ -292,7 +292,7 @@
 			/* name may change if header buffer is changed */
 			name = t_strdup(name);
 
-			if (strcmp(name, "keywords") == 0) {
+			if (strcmp(name, MAIL_INDEX_EXT_KEYWORDS) == 0) {
 				mail_index_fsck_keywords(index, map, hdr,
 							 ext_hdr, offset,
 							 &next_offset);
--- a/src/lib-index/mail-index-map.c	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/lib-index/mail-index-map.c	Sun Dec 14 06:38:24 2008 +0200
@@ -264,7 +264,7 @@
 	unsigned int i, name_area_end_offset, old_count;
 	uint32_t idx;
 
-	if (!mail_index_map_lookup_ext(map, "keywords", &idx)) {
+	if (!mail_index_map_lookup_ext(map, MAIL_INDEX_EXT_KEYWORDS, &idx)) {
 		if (array_is_created(&map->keyword_idx_map))
 			array_clear(&map->keyword_idx_map);
 		return 0;
--- a/src/lib-index/mail-index-private.h	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/lib-index/mail-index-private.h	Sun Dec 14 06:38:24 2008 +0200
@@ -36,6 +36,8 @@
 	((((u)->add_flags | (u)->remove_flags) & \
 	  MAIL_INDEX_FLAGS_MASK) == 0)
 
+#define MAIL_INDEX_EXT_KEYWORDS "keywords"
+
 typedef int mail_index_expunge_handler_t(struct mail_index_sync_map_ctx *ctx,
 					 uint32_t seq, const void *data,
 					 void **sync_context, void *context);
--- a/src/lib-index/mail-index-sync-ext.c	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/lib-index/mail-index-sync-ext.c	Sun Dec 14 06:38:24 2008 +0200
@@ -502,7 +502,8 @@
 	if (ext != NULL)
 		name = ext->name;
 
-	if (!ctx->internal_update && strcmp(name, "keywords") == 0) {
+	if (!ctx->internal_update &&
+	    strcmp(name, MAIL_INDEX_EXT_KEYWORDS) == 0) {
 		/* Keyword extension is handled internally by the keyword
 		   code. Any attempt to modify them directly could cause
 		   assert-crashes later, so prevent them immediately. */
--- a/src/lib-index/mail-index-sync-keywords.c	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/lib-index/mail-index-sync-keywords.c	Sun Dec 14 06:38:24 2008 +0200
@@ -82,8 +82,8 @@
 	i_assert(keywords_count > 0);
 
 	ext_intro_buf =
-		buffer_create_static_hard(pool_datastack_create(),
-					  sizeof(*u) + sizeof("keywords")-1);
+		buffer_create_static_hard(pool_datastack_create(), sizeof(*u) +
+					  sizeof(MAIL_INDEX_EXT_KEYWORDS)-1);
 
 	u = buffer_append_space_unsafe(ext_intro_buf, sizeof(*u));
 	u->ext_id = ext_map_idx;
@@ -98,8 +98,9 @@
 	u->record_align = 1;
 
 	if (ext_map_idx == (uint32_t)-1) {
-		u->name_size = strlen("keywords");
-		buffer_append(ext_intro_buf, "keywords", u->name_size);
+		u->name_size = strlen(MAIL_INDEX_EXT_KEYWORDS);
+		buffer_append(ext_intro_buf, MAIL_INDEX_EXT_KEYWORDS,
+			      u->name_size);
 	}
 
 	ctx->internal_update = TRUE;
@@ -126,7 +127,8 @@
 	   making sure the header is updated atomically. */
 	map = mail_index_sync_get_atomic_map(ctx);
 
-	if (!mail_index_map_lookup_ext(map, "keywords", &ext_map_idx))
+	if (!mail_index_map_lookup_ext(map, MAIL_INDEX_EXT_KEYWORDS,
+				       &ext_map_idx))
 		ext_map_idx = (uint32_t)-1;
 	else {
 		/* update existing header */
@@ -175,7 +177,8 @@
 		/* map may have changed */
 		map = ctx->view->map;
 
-		if (!mail_index_map_lookup_ext(map, "keywords", &ext_map_idx))
+		if (!mail_index_map_lookup_ext(map, MAIL_INDEX_EXT_KEYWORDS,
+					       &ext_map_idx))
 			i_unreached();
 		ext = array_idx(&map->extensions, ext_map_idx);
 
@@ -275,7 +278,8 @@
 	/* if the keyword wasn't found, the "keywords" extension was created.
 	   if it was found, the record size should already be correct, but
 	   in case it isn't just fix it ourself. */
-	if (!mail_index_map_lookup_ext(view->map, "keywords", &ext_map_idx))
+	if (!mail_index_map_lookup_ext(view->map, MAIL_INDEX_EXT_KEYWORDS,
+				       &ext_map_idx))
 		i_unreached();
 
 	ext = array_idx(&view->map->extensions, ext_map_idx);
@@ -289,7 +293,8 @@
 		keywords_ext_register(ctx, ext_map_idx, ext->reset_id,
 				      ext->hdr_size,
 				      array_count(&view->map->keyword_idx_map));
-		if (!mail_index_map_lookup_ext(view->map, "keywords",
+		if (!mail_index_map_lookup_ext(view->map,
+					       MAIL_INDEX_EXT_KEYWORDS,
 					       &ext_map_idx))
 			i_unreached();
 		ext = array_idx(&view->map->extensions, ext_map_idx);
@@ -319,7 +324,8 @@
 	const struct mail_transaction_keyword_reset *end;
 	uint32_t ext_map_idx, seq1, seq2;
 
-	if (!mail_index_map_lookup_ext(map, "keywords", &ext_map_idx)) {
+	if (!mail_index_map_lookup_ext(map, MAIL_INDEX_EXT_KEYWORDS,
+				       &ext_map_idx)) {
 		/* nothing to do */
 		return 1;
 	}
--- a/src/lib-index/mail-index.c	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/lib-index/mail-index.c	Sun Dec 14 06:38:24 2008 +0200
@@ -44,7 +44,8 @@
 	index->gid = (gid_t)-1;
 
 	index->keywords_ext_id =
-		mail_index_ext_register(index, "keywords", 128, 2, 1);
+		mail_index_ext_register(index, MAIL_INDEX_EXT_KEYWORDS,
+					128, 2, 1);
 	index->keywords_pool = pool_alloconly_create("keywords", 512);
 	i_array_init(&index->keywords, 16);
 	index->keywords_hash =
--- a/src/util/idxview.c	Sun Dec 14 05:46:31 2008 +0200
+++ b/src/util/idxview.c	Sun Dec 14 06:38:24 2008 +0200
@@ -84,7 +84,7 @@
 {
 	const void *data;
 
-	if (strcmp(ext->name, "keywords") == 0)
+	if (strcmp(ext->name, MAIL_INDEX_EXT_KEYWORDS) == 0)
 		return;
 
 	data = CONST_PTR_OFFSET(index->map->hdr_base, ext->hdr_offset);