Ping!
Do reverts require the usual reviewed-by? Markus are you happy with
this mini series to address your error_report() concerns?
Regards,
Peter
On Wed, Jan 15, 2014 at 9:06 PM, Peter Crosthwaite
<peter.crosthwa...@xilinx.com> wrote:
> This reverts commit d32934c84c72f57e78d430c22974677b7bcabe5d.
>
> The original implementation before this patch makes abortive error
> messages much more friendly. The underlying bug that required this
> change is now fixed. Revert.
>
> Signed-off-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
> ---
>
> util/error.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/util/error.c b/util/error.c
> index e5de34f..f11f1d5 100644
> --- a/util/error.c
> +++ b/util/error.c
> @@ -44,7 +44,7 @@ void error_set(Error **errp, ErrorClass err_class, const
> char *fmt, ...)
> err->err_class = err_class;
>
> if (errp == &error_abort) {
> - fprintf(stderr, "%s\n", error_get_pretty(err));
> + error_report("%s", error_get_pretty(err));
> abort();
> }
>
> @@ -80,7 +80,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass
> err_class,
> err->err_class = err_class;
>
> if (errp == &error_abort) {
> - fprintf(stderr, "%s\n", error_get_pretty(err));
> + error_report("%s", error_get_pretty(err));
> abort();
> }
>
> @@ -125,7 +125,7 @@ void error_set_win32(Error **errp, int win32_err,
> ErrorClass err_class,
> err->err_class = err_class;
>
> if (errp == &error_abort) {
> - fprintf(stderr, "%s\n", error_get_pretty(err));
> + error_report("%s", error_get_pretty(err));
> abort();
> }
>
> @@ -171,7 +171,7 @@ void error_free(Error *err)
> void error_propagate(Error **dst_err, Error *local_err)
> {
> if (local_err && dst_err == &error_abort) {
> - fprintf(stderr, "%s\n", error_get_pretty(local_err));
> + error_report("%s", error_get_pretty(local_err));
> abort();
> } else if (dst_err && !*dst_err) {
> *dst_err = local_err;
> --
> 1.8.5.3
>
