diff options
| author | Markus Armbruster | 2015-06-19 15:36:16 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2015-09-10 13:48:05 +0200 |
| commit | a9499ddd82a99c66cc72a08e72427c423acfea1c (patch) | |
| tree | cb0b7c864fa21936950890352e028b79f0877825 | |
| parent | error: De-duplicate code creating Error objects (diff) | |
| download | qemu-a9499ddd82a99c66cc72a08e72427c423acfea1c.tar.gz qemu-a9499ddd82a99c66cc72a08e72427c423acfea1c.tar.xz qemu-a9499ddd82a99c66cc72a08e72427c423acfea1c.zip | |
error: Make error_setg() a function
Saves a tiny amount of code at every call site.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | include/qapi/error.h | 4 | ||||
| -rw-r--r-- | util/error.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/qapi/error.h b/include/qapi/error.h index f44c451830..34af4e103f 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 4518642881..8f12f67012 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, ...) { |