X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fcheck.c;h=d96d94a35839c49ea1f2123f9b60442d74e88ad0;hb=94e6e730899c9a2fcc0895849a763f56c2f429a9;hp=52e24271ffc985f2f9e598ce8e991cf6e07c2957;hpb=9e47a53bb7b2baac539059a439fa0f977f2535fb;p=cc65 diff --git a/src/common/check.c b/src/common/check.c index 52e24271f..d96d94a35 100644 --- a/src/common/check.c +++ b/src/common/check.c @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 1998 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 1998-2001 Ullrich von Bassewitz */ +/* Wacholderweg 14 */ +/* D-70597 Stuttgart */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -55,10 +55,10 @@ const char* MsgProgramAborted = "Program aborted: "; static void DefaultCheckFailed (const char* msg, const char* cond, - int code, const char* file, unsigned line) + const char* file, unsigned line) attribute ((noreturn)); -void (*CheckFailed) (const char* Msg, const char* Cond, int Code, +void (*CheckFailed) (const char* Msg, const char* Cond, const char* File, unsigned Line) attribute ((noreturn)) = DefaultCheckFailed; /* Function pointer that is called from check if the condition code is true. */ @@ -66,34 +66,16 @@ void (*CheckFailed) (const char* Msg, const char* Cond, int Code, /*****************************************************************************/ -/* Code */ +/* Code */ /*****************************************************************************/ static void DefaultCheckFailed (const char* Msg, const char* Cond, - int Code, const char* File, unsigned Line) + const char* File, unsigned Line) { - /* Log the error */ - if (Code) { - AbEnd ("%s%s (= %d), file `%s', line %u", Msg, Cond, Code, File, Line); - } else { - AbEnd ("%s%s, file `%s', line %u", Msg, Cond, File, Line); - } -} - - - -void Check (const char* Msg, const char* Cond, int Code, - const char* File, unsigned Line) -/* This function is called from all check macros (see below). It checks, - * wether the given Code is true (!= 0). If so, it calls the CheckFailed - * vector with the given strings. If not, it simply returns. - */ -{ - if (Code != 0) { - CheckFailed (Msg, Cond, Code, File, Line); - } + /* Output a diagnostic and abort */ + AbEnd ("%s%s, file `%s', line %u", Msg, Cond, File, Line); }