lib-storage: Rename mailbox event field "name" to "mailbox"

The "name" could conflict with child events. It's also much clearer this
way especially when accessed via child events.

diff --git a/src/lib-storage/fail-mailbox.c b/src/lib-storage/fail-mailbox.c
index 1b79b240808a6db9595e3359ad816e313976fc19..c3a4482b47f22156e6c2273ba593a1726e004c8f 100644 (file)
--- a/src/lib-storage/fail-mailbox.c
+++ b/src/lib-storage/fail-mailbox.c
@@ -325,7 +325,7 @@ fail_mailbox_alloc(struct mail_storage *storage, struct mailbox_list *list,
 
        box->event = event_create(box->storage->event);
        event_add_category(box->event, &event_category_mailbox);
-       event_add_str(box->event, "name", box->vname);
+       event_add_str(box->event, "mailbox", box->vname);
        event_set_append_log_prefix(box->event,
                t_strdup_printf("Mailbox %s: ", box->vname));
 

diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index 8ca20cf305c4fdb2b2376dd605caf9dc37bbb8be..7f21e9f1cb3ad22cf4f7f8acc8547179700e6913 100644 (file)
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -387,7 +387,7 @@ void index_storage_mailbox_alloc(struct mailbox *box, const char *vname,
        box->index_prefix = p_strdup(box->pool, index_prefix);
        box->event = event_create(box->storage->event);
        event_add_category(box->event, &event_category_mailbox);
-       event_add_str(box->event, "name", box->vname);
+       event_add_str(box->event, "mailbox", box->vname);
        event_set_append_log_prefix(box->event,
                t_strdup_printf("Mailbox %s: ", box->vname));