From: Timo Sirainen Date: Thu, 21 Nov 2019 12:58:50 +0000 (+0200) Subject: lib-storage: Rename mailbox event field "name" to "mailbox" X-Git-Tag: 2.3.9~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05950e90d8c36373d9d2b1aa86ffdb9e1cb3e03f;p=thirdparty%2Fdovecot%2Fcore.git 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 1b79b24080..c3a4482b47 100644 --- 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 8ca20cf305..7f21e9f1cb 100644 --- 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));