From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 02/11] error: New convenience function error_report_err()
Date: Wed, 18 Feb 2015 11:34:13 +0100 [thread overview]
Message-ID: <1424255662-5393-3-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1424255662-5393-1-git-send-email-armbru@redhat.com>
I've typed error_report("%s", error_get_pretty(ERR)) too many times
already, and I've fixed too many instances of qerror_report_err(ERR)
to error_report("%s", error_get_pretty(ERR)) as well. Capture the
pattern in a convenience function.
Since it's almost invariably followed by error_free(), stuff that into
the convenience function as well.
The next patch will put it to use.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
include/qapi/error.h | 5 +++++
util/error.c | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/include/qapi/error.h b/include/qapi/error.h
index d712089..f44c451 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -83,6 +83,11 @@ Error *error_copy(const Error *err);
const char *error_get_pretty(Error *err);
/**
+ * Convenience function to error_report() and free an error object.
+ */
+void error_report_err(Error *);
+
+/**
* Propagate an error to an indirect pointer to an error. This function will
* always transfer ownership of the error reference and handles the case where
* dst_err is NULL correctly. Errors after the first are discarded.
diff --git a/util/error.c b/util/error.c
index 2ace0d8..1ff6ae5 100644
--- a/util/error.c
+++ b/util/error.c
@@ -152,6 +152,12 @@ const char *error_get_pretty(Error *err)
return err->msg;
}
+void error_report_err(Error *err)
+{
+ error_report("%s", error_get_pretty(err));
+ error_free(err);
+}
+
void error_free(Error *err)
{
if (err) {
--
1.9.3
next prev parent reply other threads:[~2015-02-18 10:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-18 10:34 [Qemu-devel] [PULL 00/11] Clean up around error_get_pretty(), qerror_report_err() Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 01/11] vhost-scsi: Improve error reporting for invalid vhostfd Markus Armbruster
2015-02-18 10:34 ` Markus Armbruster [this message]
2015-02-18 10:34 ` [Qemu-devel] [PULL 03/11] error: Use error_report_err() where appropriate Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 04/11] monitor: Clean up around monitor_handle_fd_param() Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 05/11] monitor: Avoid qerror_report_err() outside QMP command handlers Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 06/11] net: " Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 07/11] numa: " Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 08/11] tpm: " Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 09/11] vl: " Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 10/11] qemu-img: " Markus Armbruster
2015-02-18 10:34 ` [Qemu-devel] [PULL 11/11] qemu-char: " Markus Armbruster
2015-02-18 11:02 ` [Qemu-devel] [PULL 00/11] Clean up around error_get_pretty(), qerror_report_err() Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424255662-5393-3-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).