Mercurial > dovecot > core-2.2
changeset 17996:7681fcd1ba43
Use i_stream_get_error() wherever possible instead of %m
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 24 Oct 2014 22:18:29 +0300 |
parents | ce4ec584e756 |
children | d4570546b51c |
files | src/director/notify-connection.c src/lib-imap-storage/imap-msgpart.c src/lib-settings/settings-parser.c src/lib-storage/index/index-search.c src/lib-storage/index/mbox/mbox-save.c src/lib-storage/mail-copy.c src/lib-storage/mail-storage.c src/plugins/fts/fts-indexer.c src/plugins/fts/fts-parser-script.c |
diffstat | 9 files changed, 23 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/director/notify-connection.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/director/notify-connection.c Fri Oct 24 22:18:29 2014 +0300 @@ -42,7 +42,8 @@ i_error("notify: read() unexpectedly returned EOF"); notify_connection_deinit(&conn); } else if (conn->input->stream_errno != 0) { - i_error("notify: read() failed: %m"); + i_error("notify: read() failed: %s", + i_stream_get_error(conn->input)); notify_connection_deinit(&conn); } }
--- a/src/lib-imap-storage/imap-msgpart.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/lib-imap-storage/imap-msgpart.c Fri Oct 24 22:18:29 2014 +0300 @@ -365,7 +365,8 @@ if (message_get_header_size(input, &hdr_size, &has_nuls) < 0) { errno = input->stream_errno; mail_storage_set_critical(mail->box->storage, - "read(%s) failed: %m", i_stream_get_name(mail_input)); + "read(%s) failed: %s", i_stream_get_name(mail_input), + i_stream_get_error(mail_input)); i_stream_unref(&input); return -1; }
--- a/src/lib-settings/settings-parser.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/lib-settings/settings-parser.c Fri Oct 24 22:18:29 2014 +0300 @@ -962,7 +962,8 @@ break; if (input->stream_errno != 0) { ctx->error = p_strdup_printf(ctx->parser_pool, - "read() failed: %m"); + "read(%s) failed: %s", i_stream_get_name(input), + i_stream_get_error(input)); } else if (input->v_offset == 0) { ctx->error = p_strdup_printf(ctx->parser_pool, "read(%s) disconnected before receiving any data",
--- a/src/lib-storage/index/index-search.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/lib-storage/index/index-search.c Fri Oct 24 22:18:29 2014 +0300 @@ -646,7 +646,8 @@ } if (ctx->input->stream_errno != 0) { mail_storage_set_critical(ctx->index_ctx->box->storage, - "read(%s) failed: %m", i_stream_get_name(ctx->input)); + "read(%s) failed: %s", i_stream_get_name(ctx->input), + i_stream_get_error(ctx->input)); } ARG_SET_RESULT(arg, ret); @@ -716,7 +717,9 @@ search_header, &hdr_ctx); if (input->stream_errno != 0) { mail_storage_set_critical(ctx->box->storage, - "read(%s) failed: %m", i_stream_get_name(input)); + "read(%s) failed: %s", + i_stream_get_name(input), + i_stream_get_error(input)); failed = TRUE; } }
--- a/src/lib-storage/index/mbox/mbox-save.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/lib-storage/index/mbox/mbox-save.c Fri Oct 24 22:18:29 2014 +0300 @@ -635,7 +635,8 @@ if (ret == 0) return 0; if (ctx->input->stream_errno != 0) { - i_error("read(%s) failed: %m", i_stream_get_name(ctx->input)); + i_error("read(%s) failed: %s", i_stream_get_name(ctx->input), + i_stream_get_error(ctx->input)); ctx->failed = TRUE; return -1; }
--- a/src/lib-storage/mail-copy.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/lib-storage/mail-copy.c Fri Oct 24 22:18:29 2014 +0300 @@ -83,7 +83,8 @@ if (input->stream_errno != 0) { mail_storage_set_critical(ctx->transaction->box->storage, - "copy: i_stream_read() failed: %m"); + "copy: i_stream_read(%s) failed: %s", + i_stream_get_name(input), i_stream_get_error(input)); return -1; } return 0;
--- a/src/lib-storage/mail-storage.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/lib-storage/mail-storage.c Fri Oct 24 22:18:29 2014 +0300 @@ -1644,8 +1644,9 @@ i_stream_skip(value->value_stream, size); } if (value->value_stream->stream_errno != 0) { - mail_storage_set_critical(storage, "read(%s) failed: %m", - i_stream_get_name(value->value_stream)); + mail_storage_set_critical(storage, "read(%s) failed: %s", + i_stream_get_name(value->value_stream), + i_stream_get_error(value->value_stream)); return -1; } i_assert(value->value_stream->eof);
--- a/src/plugins/fts/fts-indexer.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/plugins/fts/fts-indexer.c Fri Oct 24 22:18:29 2014 +0300 @@ -192,7 +192,9 @@ } } if (ctx->input->stream_errno != 0) { - i_error("indexer read() failed: %m"); + i_error("indexer read(%s) failed: %s", + i_stream_get_name(ctx->input), + i_stream_get_error(ctx->input)); return -1; } if (ctx->input->eof) {
--- a/src/plugins/fts/fts-parser-script.c Fri Oct 24 22:11:50 2014 +0300 +++ b/src/plugins/fts/fts-parser-script.c Fri Oct 24 22:18:29 2014 +0300 @@ -100,7 +100,8 @@ content->extensions = (const void *)(args+1); } if (input->stream_errno != 0) { - i_error("parser script read() failed: %m"); + i_error("parser script read(%s) failed: %s", path, + i_stream_get_error(input)); ret = -1; } else if (!eof_seen) { if (input->v_offset == 0)