[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] error: error_set_errno() is unused, drop
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 5/7] error: error_set_errno() is unused, drop |
Date: |
Thu, 10 Sep 2015 15:32:26 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/qapi/error.h | 7 ++-----
util/error.c | 5 ++---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/qapi/error.h b/include/qapi/error.h
index 692e013..8c3a7dd 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -35,8 +35,8 @@ void error_set(Error **errp, ErrorClass err_class, const char
*fmt, ...)
* printf-style human message, followed by a strerror() string if
* @os_error is not zero.
*/
-void error_set_errno(Error **errp, int os_error, ErrorClass err_class,
- const char *fmt, ...) GCC_FMT_ATTR(4, 5);
+void error_setg_errno(Error **errp, int os_error, const char *fmt, ...)
+ GCC_FMT_ATTR(3, 4);
#ifdef _WIN32
/**
@@ -53,9 +53,6 @@ void error_setg_win32(Error **errp, int win32_err, const char
*fmt, ...)
*/
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__)
/**
* Helper for open() errors
diff --git a/util/error.c b/util/error.c
index 9620f2a..b842f20 100644
--- a/util/error.c
+++ b/util/error.c
@@ -65,8 +65,7 @@ void error_setg(Error **errp, const char *fmt, ...)
va_end(ap);
}
-void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
- const char *fmt, ...)
+void error_setg_errno(Error **errp, int os_errno, const char *fmt, ...)
{
va_list ap;
char *msg;
@@ -77,7 +76,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass
err_class,
}
va_start(ap, fmt);
- error_setv(errp, err_class, fmt, ap);
+ error_setv(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
va_end(ap);
if (os_errno != 0) {
--
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 <=
- [Qemu-devel] [PULL 1/7] error: De-duplicate code creating Error objects, Markus Armbruster, 2015/09/10
- [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