summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-06-19 22:16:14 +0200
committerMarkus Armbruster <armbru@redhat.com>2015-09-10 13:48:06 +0200
commit4463dcb85c9f992f0c4d93f2142c8d64dcc85c5c (patch)
tree9c24709edebd0911a980b4535a53d47bb12185c0
parent08e64640357cd9517aa30fd49840f05f0f2ee3a4 (diff)
downloadhqemu-4463dcb85c9f992f0c4d93f2142c8d64dcc85c5c.zip
hqemu-4463dcb85c9f992f0c4d93f2142c8d64dcc85c5c.tar.gz
error: error_set_errno() is unused, drop
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
-rw-r--r--include/qapi/error.h7
-rw-r--r--util/error.c5
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) {
OpenPOWER on IntegriCloud