diff options
Diffstat (limited to 'generic/tclPanic.c')
| -rw-r--r-- | generic/tclPanic.c | 58 |
1 files changed, 22 insertions, 36 deletions
diff --git a/generic/tclPanic.c b/generic/tclPanic.c index 2cb8aff..600307e 100644 --- a/generic/tclPanic.c +++ b/generic/tclPanic.c @@ -14,9 +14,6 @@ */ #include "tclInt.h" -#ifdef _WIN32 - MODULE_SCOPE void tclWinDebugPanic(const char *format, ...); -#endif /* * The panicProc variable contains a pointer to an application specific panic @@ -24,6 +21,13 @@ */ static Tcl_PanicProc *panicProc = NULL; + +/* + * The platformPanicProc variable contains a pointer to a platform specific + * panic procedure, if any. (TclpPanic may be NULL via a macro.) + */ + +static Tcl_PanicProc *CONST platformPanicProc = TclpPanic; /* *---------------------------------------------------------------------- @@ -45,10 +49,6 @@ void Tcl_SetPanicProc( Tcl_PanicProc *proc) { -#ifdef _WIN32 - /* tclWinDebugPanic only installs if there is no panicProc yet. */ - if ((proc != tclWinDebugPanic) || (panicProc == NULL)) -#endif panicProc = proc; } @@ -70,13 +70,13 @@ Tcl_SetPanicProc( void Tcl_PanicVA( - const char *format, /* Format string, suitable for passing to + CONST char *format, /* Format string, suitable for passing to * fprintf. */ va_list argList) /* Variable argument list. */ { - char *arg1, *arg2, *arg3; /* Additional arguments (variable in number) - * to pass to fprintf. */ - char *arg4, *arg5, *arg6, *arg7, *arg8; + char *arg1, *arg2, *arg3, *arg4; /* Additional arguments (variable in + * number) to pass to fprintf. */ + char *arg5, *arg6, *arg7, *arg8; arg1 = va_arg(argList, char *); arg2 = va_arg(argList, char *); @@ -88,32 +88,18 @@ Tcl_PanicVA( arg8 = va_arg(argList, char *); if (panicProc != NULL) { - panicProc(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); -#ifdef _WIN32 - } else if (IsDebuggerPresent()) { - tclWinDebugPanic(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); -#endif + (void) (*panicProc)(format, arg1, arg2, arg3, arg4, + arg5, arg6, arg7, arg8); + } else if (platformPanicProc != NULL) { + (void) (*platformPanicProc)(format, arg1, arg2, arg3, arg4, + arg5, arg6, arg7, arg8); } else { - fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, - arg8); - fprintf(stderr, "\n"); - fflush(stderr); + (void) fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6, + arg7, arg8); + (void) fprintf(stderr, "\n"); + (void) fflush(stderr); + abort(); } - /* In case the users panic proc does not abort, we do it here */ -#ifdef _WIN32 -# if defined(__GNUC__) - __builtin_trap(); -# elif defined(_WIN64) - __debugbreak(); -# elif defined(_MSC_VER) - _asm {int 3} -# else - DebugBreak(); -# endif - ExitProcess(1); -#else - abort(); -#endif } /* @@ -135,7 +121,7 @@ Tcl_PanicVA( /* ARGSUSED */ void Tcl_Panic( - const char *format, + CONST char *format, ...) { va_list argList; |