Mercurial > dovecot > core-2.2
changeset 9567:d4bce0753105 HEAD
Use mailbox_get_vname() to improve logging.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 07 Jul 2009 14:46:50 -0400 |
| parents | 2c90d6cf8b09 |
| children | 4aa97c04682d |
| files | src/imap/imap-fetch-body.c src/plugins/convert/convert-storage.c src/plugins/mail-log/mail-log-plugin.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/imap-fetch-body.c Tue Jul 07 14:46:32 2009 -0400 +++ b/src/imap/imap-fetch-body.c Tue Jul 07 14:46:50 2009 -0400 @@ -48,7 +48,7 @@ errno = ctx->cur_input->stream_errno; i_error("FETCH for mailbox %s UID %u " "failed to read message input: %m", - mailbox_get_name(ctx->mail->box), ctx->mail->uid); + mailbox_get_vname(ctx->mail->box), ctx->mail->uid); } static int seek_partial(unsigned int select_counter, unsigned int uid, @@ -209,7 +209,7 @@ disconnect the client and hope that next try works. */ i_error("FETCH %s for mailbox %s UID %u got too little data: " "%"PRIuUOFF_T" vs %"PRIuUOFF_T, ctx->cur_name, - mailbox_get_name(ctx->mail->box), ctx->mail->uid, + mailbox_get_vname(ctx->mail->box), ctx->mail->uid, (uoff_t)sent, virtual_size); mail_set_cache_corrupted(ctx->mail, ctx->cur_size_field); client_disconnect(ctx->client, "FETCH failed"); @@ -272,7 +272,7 @@ i_error("FETCH %s for mailbox %s UID %u " "got too little data (copying): " "%"PRIuUOFF_T" vs %"PRIuUOFF_T, - ctx->cur_name, mailbox_get_name(ctx->mail->box), + ctx->cur_name, mailbox_get_vname(ctx->mail->box), ctx->mail->uid, ctx->cur_offset, ctx->cur_size); client_disconnect(ctx->client, "FETCH failed"); return -1;
--- a/src/plugins/convert/convert-storage.c Tue Jul 07 14:46:32 2009 -0400 +++ b/src/plugins/convert/convert-storage.c Tue Jul 07 14:46:50 2009 -0400 @@ -318,7 +318,7 @@ if (mailbox_copy_mails(srcbox, destbox, dotlock, &error) < 0) { i_error("Mailbox conversion: Couldn't copy mailbox %s: %s", - mailbox_get_name(srcbox), error); + mailbox_get_vname(srcbox), error); } mailbox_close(&srcbox);
--- a/src/plugins/mail-log/mail-log-plugin.c Tue Jul 07 14:46:32 2009 -0400 +++ b/src/plugins/mail-log/mail-log-plugin.c Tue Jul 07 14:46:50 2009 -0400 @@ -214,7 +214,7 @@ /* most operations are for INBOX, and POP3 has only INBOX, so don't add it. */ - mailbox_str = mailbox_get_name(box); + mailbox_str = mailbox_get_vname(box); if (strcmp(mailbox_str, "INBOX") != 0) { str_printfa(str, "box=%s, ", str_sanitize(mailbox_str, MAILBOX_NAME_LOG_LEN)); @@ -455,7 +455,7 @@ return -1; T_BEGIN { - name = str_sanitize(mailbox_get_name(ctx->transaction->box), + name = str_sanitize(mailbox_get_vname(ctx->transaction->box), MAILBOX_NAME_LOG_LEN); mail_log_action(ctx->transaction, mail, MAIL_LOG_EVENT_COPY, name);