dbox: Renamed cleanup -> purge.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/dbox/dbox-map.c b/src/lib-storage/index/dbox/dbox-map.c
index 391051b5bed046ba44a9d680664516f9ef5584c8..e4dda0dce976be6f266671873c0bdefccbbe8b21 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-map.c
+++ b/src/lib-storage/index/dbox/dbox-map.c
@@ -525,8 +525,8 @@ dbox_map_file_try_append(struct dbox_map_append_context *ctx,
                return TRUE;
        }
        if (file->lock != NULL) {
-               /* already locked, we're possibly in the middle of cleaning
-                  it up in which case we really don't want to write there. */
+               /* already locked, we're possibly in the middle of purging it
+                  in which case we really don't want to write there. */
                dbox_file_unref(&file);
                return TRUE;
        }

diff --git a/src/lib-storage/index/dbox/dbox-storage.c b/src/lib-storage/index/dbox/dbox-storage.c
index cae5c076e646090797e92e88f589dcdc8e7b7562..b540988ee344e893a04054dd921a42ac4bbacd90 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-storage.c
+++ b/src/lib-storage/index/dbox/dbox-storage.c
@@ -220,7 +220,7 @@ static void dbox_destroy(struct mail_storage *_storage)
                        return;
        }
 
-       dbox_sync_cleanup(storage);
+       dbox_sync_purge(storage);
        dbox_files_free(storage);
        dbox_map_deinit(&storage->map);
        array_free(&storage->open_files);

diff --git a/src/lib-storage/index/dbox/dbox-sync-file.c b/src/lib-storage/index/dbox/dbox-sync-file.c
index b03d6b6936a59a42a90685a31b25655b8a227d01..1e765250cfe692cefce63193146637656d318cdd 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-sync-file.c
+++ b/src/lib-storage/index/dbox/dbox-sync-file.c
@@ -106,7 +106,7 @@ dbox_sync_file_copy_metadata(struct dbox_file *file, struct ostream *output)
        return 1;
 }
 
-int dbox_sync_file_cleanup(struct dbox_file *file)
+int dbox_sync_file_purge(struct dbox_file *file)
 {
        struct mail_storage *storage = &file->storage->storage;
        struct dbox_file *out_file;
@@ -163,7 +163,7 @@ int dbox_sync_file_cleanup(struct dbox_file *file)
                if (msgs[i].offset != offset) {
                        /* map doesn't match file's actual contents */
                        dbox_file_set_corrupted(file,
-                               "cleanup found mismatched offsets "
+                               "purging found mismatched offsets "
                                "(%"PRIuUOFF_T" vs %u, %u/%u)",
                                offset, msgs[i].offset, i, count);
                        ret = 0;

diff --git a/src/lib-storage/index/dbox/dbox-sync.c b/src/lib-storage/index/dbox/dbox-sync.c
index f0d893b1f07f25f148a031e41043d2aac19f0da8..c81cb8d389ebe6f6b53cfd7b825f3b63034b5462 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-sync.c
+++ b/src/lib-storage/index/dbox/dbox-sync.c
@@ -350,7 +350,7 @@ dbox_storage_sync_init(struct mailbox *box, enum mailbox_sync_flags flags)
        return index_mailbox_sync_init(box, flags, ret < 0);
 }
 
-void dbox_sync_cleanup(struct dbox_storage *storage)
+void dbox_sync_purge(struct dbox_storage *storage)
 {
        const ARRAY_TYPE(seq_range) *ref0_file_ids;
        struct dbox_file *file;
@@ -364,7 +364,7 @@ void dbox_sync_cleanup(struct dbox_storage *storage)
        while (seq_range_array_iter_nth(&iter, i++, &file_id)) T_BEGIN {
                file = dbox_file_init_multi(storage, file_id);
                if (dbox_file_open_or_create(file, &deleted) > 0 && !deleted)
-                       (void)dbox_sync_file_cleanup(file);
+                       (void)dbox_sync_file_purge(file);
                else
                        dbox_map_remove_file_id(storage->map, file_id);
                dbox_file_unref(&file);

diff --git a/src/lib-storage/index/dbox/dbox-sync.h b/src/lib-storage/index/dbox/dbox-sync.h
index 98f77dff5bddb2c771e04c65034338bf1345b6d0..c90c8134290ededee9b55e015b8a17ae59d980e3 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-sync.h
+++ b/src/lib-storage/index/dbox/dbox-sync.h
@@ -37,10 +37,10 @@ int dbox_sync_begin(struct dbox_mailbox *mbox, enum dbox_sync_flags flags,
 int dbox_sync_finish(struct dbox_sync_context **ctx, bool success);
 int dbox_sync(struct dbox_mailbox *mbox);
 
-void dbox_sync_cleanup(struct dbox_storage *storage);
+void dbox_sync_purge(struct dbox_storage *storage);
 int dbox_sync_file(struct dbox_sync_context *ctx,
                   const struct dbox_sync_file_entry *entry);
-int dbox_sync_file_cleanup(struct dbox_file *file);
+int dbox_sync_file_purge(struct dbox_file *file);
 
 struct dbox_sync_rebuild_context *
 dbox_sync_index_rebuild_init(struct dbox_mailbox *mbox,