Commit 732c66ce authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Edgar E. Iglesias
Browse files

Revert "error: Don't use error_report() for assertion msgs." 



This reverts commit d32934c8.

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: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent 3dbe85b8

util/error.c

+4 −4
Original line number Diff line number Diff line
@@ -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;