[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/11] error: New convenience function error_repor
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 02/11] error: New convenience function error_report_err() |
Date: |
Wed, 18 Feb 2015 12:10:32 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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
- [Qemu-devel] [PULL v2 00/11] Clean up around error_get_pretty(), qerror_report_err(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 02/11] error: New convenience function error_report_err(),
Markus Armbruster <=
- [Qemu-devel] [PULL v2 10/11] qemu-img: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 01/11] vhost-scsi: Improve error reporting for invalid vhostfd, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 11/11] qemu-char: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 04/11] monitor: Clean up around monitor_handle_fd_param(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 06/11] net: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 05/11] monitor: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 03/11] error: Use error_report_err() where appropriate, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 09/11] vl: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 07/11] numa: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 08/11] tpm: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18