[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/7] error: Make error_setg() a function
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 2/7] error: Make error_setg() a function |
Date: |
Thu, 23 Jul 2015 16:01:33 +0200 |
Saves a tiny amount of code at every call site.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/qapi/error.h | 4 ++--
util/error.c | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/qapi/error.h b/include/qapi/error.h
index f44c451..34af4e1 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -51,8 +51,8 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass
err_class,
/**
* Same as error_set(), but sets a generic error
*/
-#define error_setg(errp, fmt, ...) \
- error_set(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
+void error_setg(Error **errp, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
#define error_setg_errno(errp, os_error, fmt, ...) \
error_set_errno(errp, os_error, ERROR_CLASS_GENERIC_ERROR, \
fmt, ## __VA_ARGS__)
diff --git a/util/error.c b/util/error.c
index 4518642..8f12f67 100644
--- a/util/error.c
+++ b/util/error.c
@@ -56,6 +56,15 @@ void error_set(Error **errp, ErrorClass err_class, const
char *fmt, ...)
va_end(ap);
}
+void error_setg(Error **errp, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ error_setv(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
+ va_end(ap);
+}
+
void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
const char *fmt, ...)
{
--
1.9.3
- [Qemu-devel] [PATCH v2 0/7] error: On abort, report where the error was created, Markus Armbruster, 2015/07/23
- [Qemu-devel] [PATCH v2 2/7] error: Make error_setg() a function,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 3/7] qga: Clean up unnecessarily dirty casts, Markus Armbruster, 2015/07/23
- [Qemu-devel] [PATCH v2 7/7] error: On abort, report where the error was created, Markus Armbruster, 2015/07/23
- [Qemu-devel] [PATCH v2 1/7] error: De-duplicate code creating Error objects, Markus Armbruster, 2015/07/23
- [Qemu-devel] [PATCH v2 6/7] error: Revamp interface documentation, Markus Armbruster, 2015/07/23