From 8aa802a6b768e811e492c7404a58c52ecfb382ed Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 18 Dec 2015 16:35:13 +0100 Subject: error: Don't decorate original error message when adding to it Prepend the additional information, colon, space to the original message without enclosing it in parenthesis or quotes, like we do elsewhere. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <1450452927-8346-11-git-send-email-armbru@redhat.com> --- tests/test-aio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test-aio.c') diff --git a/tests/test-aio.c b/tests/test-aio.c index e188d8c13d..f0b447ea42 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -832,7 +832,7 @@ int main(int argc, char **argv) ctx = aio_context_new(&local_error); if (!ctx) { - error_report("Failed to create AIO Context: '%s'", + error_report("Failed to create AIO Context: %s", error_get_pretty(local_error)); error_free(local_error); exit(1); -- cgit v1.2.1 From c29b77f955ff2f7b57c1e71e9dc26243eefd0b28 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 18 Dec 2015 16:35:14 +0100 Subject: error: Use error_reportf_err() where it makes obvious sense Done with this Coccinelle semantic patch @@ expression FMT, E, S; expression list ARGS; @@ - error_report(FMT, ARGS, error_get_pretty(E)); + error_reportf_err(E, FMT/*@@@*/, ARGS); ( - error_free(E); | exit(S); | abort(); ) followed by a replace of '%s"/*@@@*/' by '"' and some line rewrapping, because I can't figure out how to make Coccinelle transform strings. We now use the error whole instead of just its message obtained with error_get_pretty(). This avoids suppressing its hint (see commit 50b7b00), but I can't see how the errors touched in this commit could come with hints. Signed-off-by: Markus Armbruster Message-Id: <1450452927-8346-12-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- tests/test-aio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/test-aio.c') diff --git a/tests/test-aio.c b/tests/test-aio.c index f0b447ea42..6ccea98977 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -832,9 +832,7 @@ int main(int argc, char **argv) ctx = aio_context_new(&local_error); if (!ctx) { - error_report("Failed to create AIO Context: %s", - error_get_pretty(local_error)); - error_free(local_error); + error_reportf_err(local_error, "Failed to create AIO Context: "); exit(1); } src = aio_get_g_source(ctx); -- cgit v1.2.1