[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] error: De-duplicate code creating Error objects
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 1/7] error: De-duplicate code creating Error objects |
Date: |
Thu, 10 Sep 2015 15:32:22 +0200 |
Duplicated when commit 680d16d added error_set_errno(), and again when
commit 20840d4 added error_set_win32().
Make the original copy in error_set() reusable by factoring out
error_setv(), then rewrite error_set_errno() and error_set_win32() on
top of it.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
util/error.c | 70 ++++++++++++++++++++++--------------------------------------
1 file changed, 26 insertions(+), 44 deletions(-)
diff --git a/util/error.c b/util/error.c
index 14f4351..4518642 100644
--- a/util/error.c
+++ b/util/error.c
@@ -22,10 +22,10 @@ struct Error
Error *error_abort;
-void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
+static void error_setv(Error **errp, ErrorClass err_class,
+ const char *fmt, va_list ap)
{
Error *err;
- va_list ap;
int saved_errno = errno;
if (errp == NULL) {
@@ -34,10 +34,7 @@ void error_set(Error **errp, ErrorClass err_class, const
char *fmt, ...)
assert(*errp == NULL);
err = g_malloc0(sizeof(*err));
-
- va_start(ap, fmt);
err->msg = g_strdup_vprintf(fmt, ap);
- va_end(ap);
err->err_class = err_class;
if (errp == &error_abort) {
@@ -50,38 +47,35 @@ void error_set(Error **errp, ErrorClass err_class, const
char *fmt, ...)
errno = saved_errno;
}
+void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ error_setv(errp, err_class, fmt, ap);
+ va_end(ap);
+}
+
void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
const char *fmt, ...)
{
- Error *err;
- char *msg1;
va_list ap;
+ char *msg;
int saved_errno = errno;
if (errp == NULL) {
return;
}
- assert(*errp == NULL);
-
- err = g_malloc0(sizeof(*err));
va_start(ap, fmt);
- msg1 = g_strdup_vprintf(fmt, ap);
+ error_setv(errp, err_class, fmt, ap);
+ va_end(ap);
+
if (os_errno != 0) {
- err->msg = g_strdup_printf("%s: %s", msg1, strerror(os_errno));
- g_free(msg1);
- } else {
- err->msg = msg1;
+ msg = (*errp)->msg;
+ (*errp)->msg = g_strdup_printf("%s: %s", msg, strerror(os_errno));
+ g_free(msg);
}
- va_end(ap);
- err->err_class = err_class;
-
- if (errp == &error_abort) {
- error_report_err(err);
- abort();
- }
-
- *errp = err;
errno = saved_errno;
}
@@ -96,37 +90,25 @@ void error_setg_file_open(Error **errp, int os_errno, const
char *filename)
void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
const char *fmt, ...)
{
- Error *err;
- char *msg1;
va_list ap;
+ char *msg1, *msg2;
if (errp == NULL) {
return;
}
- assert(*errp == NULL);
-
- err = g_malloc0(sizeof(*err));
va_start(ap, fmt);
- msg1 = g_strdup_vprintf(fmt, ap);
+ error_setv(errp, err_class, fmt, ap);
+ va_end(ap);
+
if (win32_err != 0) {
- char *msg2 = g_win32_error_message(win32_err);
- err->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
- (unsigned)win32_err);
+ msg1 = (*errp)->msg;
+ msg2 = g_win32_error_message(win32_err);
+ (*errp)->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
+ (unsigned)win32_err);
g_free(msg2);
g_free(msg1);
- } else {
- err->msg = msg1;
}
- va_end(ap);
- err->err_class = err_class;
-
- if (errp == &error_abort) {
- error_report_err(err);
- abort();
- }
-
- *errp = err;
}
#endif
--
2.4.3
- [Qemu-devel] [PULL 0/7] error: On abort, report where the error was created, Markus Armbruster, 2015/09/10
- [Qemu-devel] [PULL 5/7] error: error_set_errno() is unused, drop, Markus Armbruster, 2015/09/10
- [Qemu-devel] [PULL 1/7] error: De-duplicate code creating Error objects,
Markus Armbruster <=
- [Qemu-devel] [PULL 6/7] error: Revamp interface documentation, Markus Armbruster, 2015/09/10
- [Qemu-devel] [PULL 7/7] error: On abort, report where the error was created, Markus Armbruster, 2015/09/10
- [Qemu-devel] [PULL 2/7] error: Make error_setg() a function, Markus Armbruster, 2015/09/10
- [Qemu-devel] [PULL 4/7] qga/vss-win32: Document the DLL requires non-null errp, Markus Armbruster, 2015/09/10
- [Qemu-devel] [PULL 3/7] qga: Clean up unnecessarily dirty casts, Markus Armbruster, 2015/09/10
- Re: [Qemu-devel] [PULL 0/7] error: On abort, report where the error was created, Peter Maydell, 2015/09/10