From: Timo Sirainen Date: Fri, 24 Oct 2014 19:18:29 +0000 (+0300) Subject: Use i_stream_get_error() wherever possible instead of %m X-Git-Tag: 2.2.15~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5351cfc57c3698a3b9e8ff252ecb34a462e818c;p=thirdparty%2Fdovecot%2Fcore.git Use i_stream_get_error() wherever possible instead of %m --- diff --git a/src/director/notify-connection.c b/src/director/notify-connection.c index ff935ef9d6..a24119088a 100644 --- a/src/director/notify-connection.c +++ b/src/director/notify-connection.c @@ -42,7 +42,8 @@ static void notify_connection_input(struct notify_connection *conn) 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); } } diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c index a8c883543d..f4daff5900 100644 --- a/src/lib-imap-storage/imap-msgpart.c +++ b/src/lib-imap-storage/imap-msgpart.c @@ -365,7 +365,8 @@ imap_msgpart_get_partial_header(struct mail *mail, struct istream *mail_input, 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; } diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c index 1832a686c0..4b9e07692c 100644 --- a/src/lib-settings/settings-parser.c +++ b/src/lib-settings/settings-parser.c @@ -962,7 +962,8 @@ int settings_parse_stream_read(struct setting_parser_context *ctx, 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", diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c index baa51b962c..3b5ce2d6e0 100644 --- a/src/lib-storage/index/index-search.c +++ b/src/lib-storage/index/index-search.c @@ -646,7 +646,8 @@ static void search_body(struct mail_search_arg *arg, } 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 @@ static int search_arg_match_text(struct mail_search_arg *args, 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; } } diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c index 410f9969ea..627717526d 100644 --- a/src/lib-storage/index/mbox/mbox-save.c +++ b/src/lib-storage/index/mbox/mbox-save.c @@ -635,7 +635,8 @@ int mbox_save_continue(struct mail_save_context *_ctx) 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; } diff --git a/src/lib-storage/mail-copy.c b/src/lib-storage/mail-copy.c index aea30e1592..e9b5eb704f 100644 --- a/src/lib-storage/mail-copy.c +++ b/src/lib-storage/mail-copy.c @@ -83,7 +83,8 @@ mail_storage_try_copy(struct mail_save_context **_ctx, struct mail *mail) 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; diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c index 45fd9875c2..10fd539388 100644 --- a/src/lib-storage/mail-storage.c +++ b/src/lib-storage/mail-storage.c @@ -1644,8 +1644,9 @@ int mailbox_attribute_value_to_string(struct mail_storage *storage, 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); diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c index fcf4457192..270d6da3cb 100644 --- a/src/plugins/fts/fts-indexer.c +++ b/src/plugins/fts/fts-indexer.c @@ -192,7 +192,9 @@ static int fts_indexer_input(struct fts_indexer_context *ctx) } } 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) { diff --git a/src/plugins/fts/fts-parser-script.c b/src/plugins/fts/fts-parser-script.c index c8f629af20..31ff24292b 100644 --- a/src/plugins/fts/fts-parser-script.c +++ b/src/plugins/fts/fts-parser-script.c @@ -100,7 +100,8 @@ static int script_contents_read(struct mail_user *user) 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)