error: Consistently name Error ** objects errp, and not err
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
7daecb3065
commit
64dfefed16
|
@ -27,14 +27,16 @@ typedef struct Error Error;
|
||||||
* printf-style human message. This function is not meant to be used outside
|
* printf-style human message. This function is not meant to be used outside
|
||||||
* of QEMU.
|
* of QEMU.
|
||||||
*/
|
*/
|
||||||
void error_set(Error **err, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(3, 4);
|
void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
|
||||||
|
GCC_FMT_ATTR(3, 4);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set an indirect pointer to an error given a ErrorClass value and a
|
* Set an indirect pointer to an error given a ErrorClass value and a
|
||||||
* printf-style human message, followed by a strerror() string if
|
* printf-style human message, followed by a strerror() string if
|
||||||
* @os_error is not zero.
|
* @os_error is not zero.
|
||||||
*/
|
*/
|
||||||
void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(4, 5);
|
void error_set_errno(Error **errp, int os_error, ErrorClass err_class,
|
||||||
|
const char *fmt, ...) GCC_FMT_ATTR(4, 5);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
/**
|
/**
|
||||||
|
@ -42,19 +44,22 @@ void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char
|
||||||
* printf-style human message, followed by a g_win32_error_message() string if
|
* printf-style human message, followed by a g_win32_error_message() string if
|
||||||
* @win32_err is not zero.
|
* @win32_err is not zero.
|
||||||
*/
|
*/
|
||||||
void error_set_win32(Error **err, int win32_err, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(4, 5);
|
void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
|
||||||
|
const char *fmt, ...) GCC_FMT_ATTR(4, 5);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Same as error_set(), but sets a generic error
|
* Same as error_set(), but sets a generic error
|
||||||
*/
|
*/
|
||||||
#define error_setg(err, fmt, ...) \
|
#define error_setg(errp, fmt, ...) \
|
||||||
error_set(err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
|
error_set(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
|
||||||
#define error_setg_errno(err, os_error, fmt, ...) \
|
#define error_setg_errno(errp, os_error, fmt, ...) \
|
||||||
error_set_errno(err, os_error, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
|
error_set_errno(errp, os_error, ERROR_CLASS_GENERIC_ERROR, \
|
||||||
|
fmt, ## __VA_ARGS__)
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define error_setg_win32(err, win32_err, fmt, ...) \
|
#define error_setg_win32(errp, win32_err, fmt, ...) \
|
||||||
error_set_win32(err, win32_err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
|
error_set_win32(errp, win32_err, ERROR_CLASS_GENERIC_ERROR, \
|
||||||
|
fmt, ## __VA_ARGS__)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -66,7 +71,7 @@ void error_setg_file_open(Error **errp, int os_errno, const char *filename);
|
||||||
* Returns true if an indirect pointer to an error is pointing to a valid
|
* Returns true if an indirect pointer to an error is pointing to a valid
|
||||||
* error object.
|
* error object.
|
||||||
*/
|
*/
|
||||||
bool error_is_set(Error **err);
|
bool error_is_set(Error **errp);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the error class of an error object.
|
* Get the error class of an error object.
|
||||||
|
@ -88,7 +93,7 @@ const char *error_get_pretty(Error *err);
|
||||||
* always transfer ownership of the error reference and handles the case where
|
* always transfer ownership of the error reference and handles the case where
|
||||||
* dst_err is NULL correctly. Errors after the first are discarded.
|
* dst_err is NULL correctly. Errors after the first are discarded.
|
||||||
*/
|
*/
|
||||||
void error_propagate(Error **dst_err, Error *local_err);
|
void error_propagate(Error **dst_errp, Error *local_err);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Free an error object.
|
* Free an error object.
|
||||||
|
|
|
@ -165,13 +165,13 @@ void error_free(Error *err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void error_propagate(Error **dst_err, Error *local_err)
|
void error_propagate(Error **dst_errp, Error *local_err)
|
||||||
{
|
{
|
||||||
if (local_err && dst_err == &error_abort) {
|
if (local_err && dst_errp == &error_abort) {
|
||||||
error_report("%s", error_get_pretty(local_err));
|
error_report("%s", error_get_pretty(local_err));
|
||||||
abort();
|
abort();
|
||||||
} else if (dst_err && !*dst_err) {
|
} else if (dst_errp && !*dst_errp) {
|
||||||
*dst_err = local_err;
|
*dst_errp = local_err;
|
||||||
} else if (local_err) {
|
} else if (local_err) {
|
||||||
error_free(local_err);
|
error_free(local_err);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue