From e7cf59e84767e30b507b6bd7c1347072ec12b636 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 19 Jun 2015 20:44:54 +0200 Subject: qga: Clean up unnecessarily dirty casts qga_vss_fsfreeze() casts error_set_win32() from void (*)(Error **, int, ErrorClass, const char *, ...) to void (*)(void **, int, int, const char *, ...) The result is later called. Since the two types are not compatible, the call is undefined behavior. It works in practice anyway. However, there's no real need for trickery here. Clean it up as follows: * Declare struct Error, and fix the first parameter. * Switch to error_setg_win32(). This gets rid of the troublesome ErrorClass parameter. Requires converting error_setg_win32() from macro to function, but that's trivially easy, because this is the only user of error_set_win32(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- util/error.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/error.c b/util/error.c index 8f12f67..9620f2a 100644 --- a/util/error.c +++ b/util/error.c @@ -96,8 +96,7 @@ void error_setg_file_open(Error **errp, int os_errno, const char *filename) #ifdef _WIN32 -void error_set_win32(Error **errp, int win32_err, ErrorClass err_class, - const char *fmt, ...) +void error_setg_win32(Error **errp, int win32_err, const char *fmt, ...) { va_list ap; char *msg1, *msg2; @@ -107,7 +106,7 @@ void error_set_win32(Error **errp, int win32_err, 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 (win32_err != 0) { -- cgit v1.1