Replaced literal "keywords" strings with a macro.

--HG--
branch : HEAD

diff --git a/src/lib-index/mail-index-fsck.c b/src/lib-index/mail-index-fsck.c
index bf9cfb4beb7de2010c51ad8c99c5143f8d17984c..a3598af39e3adcad25baf146a340f5a113263d39 100644 (file)
--- a/src/lib-index/mail-index-fsck.c
+++ b/src/lib-index/mail-index-fsck.c
@@ -143,7 +143,7 @@ mail_index_fsck_keywords(struct mail_index *index, struct mail_index_map *map,
        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 @@ mail_index_fsck_extensions(struct mail_index *index, struct mail_index_map *map,
                        /* 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);

diff --git a/src/lib-index/mail-index-map.c b/src/lib-index/mail-index-map.c
index 2e32a92f5dd3c7662ce95670c0d1e32defb47c56..86e0f43b9e0f0f137c23024b6f8bdb8c32e6993f 100644 (file)
--- a/src/lib-index/mail-index-map.c
+++ b/src/lib-index/mail-index-map.c
@@ -264,7 +264,7 @@ int mail_index_map_parse_keywords(struct mail_index_map *map)
        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;

diff --git a/src/lib-index/mail-index-private.h b/src/lib-index/mail-index-private.h
index e2486180729f185d845227510cca66f06ed1d0f9..fb0a8b242adc819eca953f408ccdf58654215bbf 100644 (file)
--- a/src/lib-index/mail-index-private.h
+++ b/src/lib-index/mail-index-private.h
@@ -36,6 +36,8 @@ struct mail_index_sync_map_ctx;
        ((((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);

diff --git a/src/lib-index/mail-index-sync-ext.c b/src/lib-index/mail-index-sync-ext.c
index 66f36f05997c65558399942c4924f79f1a14b30f..cb7b8e0881d24c41ad8a1f79025e128291fb7c35 100644 (file)
--- a/src/lib-index/mail-index-sync-ext.c
+++ b/src/lib-index/mail-index-sync-ext.c
@@ -502,7 +502,8 @@ int mail_index_sync_ext_intro(struct mail_index_sync_map_ctx *ctx,
        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. */

diff --git a/src/lib-index/mail-index-sync-keywords.c b/src/lib-index/mail-index-sync-keywords.c
index 825edc83a476d15e748c39a1db4c9f9ab636280b..46dd7a4d9efe6007aa5d30a506f1df8d534a2cc3 100644 (file)
--- a/src/lib-index/mail-index-sync-keywords.c
+++ b/src/lib-index/mail-index-sync-keywords.c
@@ -82,8 +82,8 @@ static void keywords_ext_register(struct mail_index_sync_map_ctx *ctx,
        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 @@ static void keywords_ext_register(struct mail_index_sync_map_ctx *ctx,
        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 @@ keywords_header_add(struct mail_index_sync_map_ctx *ctx,
           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 @@ keywords_header_add(struct mail_index_sync_map_ctx *ctx,
                /* 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 @@ int mail_index_sync_keywords(struct mail_index_sync_map_ctx *ctx,
        /* 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 @@ int mail_index_sync_keywords(struct mail_index_sync_map_ctx *ctx,
                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 @@ mail_index_sync_keywords_reset(struct mail_index_sync_map_ctx *ctx,
        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;
        }

diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 178dd2f91d3757ab47666d7c4e5dee636c956340..01cfd1530f865fa3ea256658f08d29b26f4753ce 100644 (file)
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -44,7 +44,8 @@ struct mail_index *mail_index_alloc(const char *dir, const char *prefix)
        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 =

diff --git a/src/util/idxview.c b/src/util/idxview.c
index bfc7bb7a9db2ac7b3618905977624b736d63dadb..d8cff30bfa338dcec9f272e7411b2a3b1a89aa5e 100644 (file)
--- a/src/util/idxview.c
+++ b/src/util/idxview.c
@@ -84,7 +84,7 @@ static void dump_extension_header(struct mail_index *index,
 {
        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);