Loading include/qapi/error.h +2 −5 Original line number Diff line number Diff line Loading @@ -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 /** Loading @@ -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 Loading util/error.c +2 −3 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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) { Loading Loading
include/qapi/error.h +2 −5 Original line number Diff line number Diff line Loading @@ -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 /** Loading @@ -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 Loading
util/error.c +2 −3 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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) { Loading