diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tclInt.h | 3 | ||||
| -rw-r--r-- | generic/tclPanic.c | 12 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 16 | ||||
| -rw-r--r-- | win/tclWinPort.h | 18 |
5 files changed, 17 insertions, 36 deletions
@@ -4,6 +4,10 @@ * generic/tclGetDate.y: * generic/tclDate.c: * generic/tclLiteral.c: (char *) cast in ckfree call + * generic/tclPanic.c: Feature Request 2814786: remove TclpPanic + * generic/tclInt.h + * unix/tclUnixPort.h + * win/tclWinPort.h 2009-07-22 Alexandre Ferrieux <ferrieux@users.sourceforge.net> diff --git a/generic/tclInt.h b/generic/tclInt.h index d2d8830..2f521eb 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.430 2009/07/15 13:17:18 dkf Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.431 2009/07/22 19:54:49 nijtmans Exp $ */ #ifndef _TCLINT @@ -2868,7 +2868,6 @@ MODULE_SCOPE Tcl_Channel TclpOpenTemporaryFile(Tcl_Obj *dirObj, Tcl_Obj *resultingNameObj); MODULE_SCOPE Tcl_Obj * TclPathPart(Tcl_Interp *interp, Tcl_Obj *pathPtr, Tcl_PathPart portion); -MODULE_SCOPE void TclpPanic(const char *format, ...); MODULE_SCOPE char * TclpReadlink(const char *fileName, Tcl_DString *linkPtr); MODULE_SCOPE void TclpReleaseFile(TclFile file); diff --git a/generic/tclPanic.c b/generic/tclPanic.c index e74df68..b3a5ed6 100644 --- a/generic/tclPanic.c +++ b/generic/tclPanic.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPanic.c,v 1.13 2009/06/30 00:56:08 das Exp $ + * RCS: @(#) $Id: tclPanic.c,v 1.14 2009/07/22 19:54:50 nijtmans Exp $ */ #include "tclInt.h" @@ -24,13 +24,6 @@ */ 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; /* *---------------------------------------------------------------------- @@ -92,9 +85,6 @@ Tcl_PanicVA( if (panicProc != NULL) { panicProc(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); - } else if (platformPanicProc != NULL) { - platformPanicProc(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, - arg8); } else { fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index bc387ca..f740c48 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -19,7 +19,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixPort.h,v 1.69 2009/06/15 16:24:45 rmax Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.70 2009/07/22 19:54:50 nijtmans Exp $ */ #ifndef _TCLUNIXPORT @@ -459,12 +459,6 @@ extern char **environ; #endif /* - * There is no platform-specific panic routine for Unix in the Tcl internals. - */ - -#define TclpPanic ((Tcl_PanicProc *) NULL) - -/* * Darwin specifc configure overrides. */ @@ -553,8 +547,8 @@ extern char **environ; /* *--------------------------------------------------------------------------- - * The following macros and declarations represent the interface between - * generic and unix-specific parts of Tcl. Some of the macros may override + * The following macros and declarations represent the interface between + * generic and unix-specific parts of Tcl. Some of the macros may override * functions declared in tclInt.h. *--------------------------------------------------------------------------- */ @@ -571,7 +565,7 @@ typedef int socklen_t; #endif /* - * The following macros have trivial definitions, allowing generic code to + * The following macros have trivial definitions, allowing generic code to * address platform-specific issues. */ @@ -608,7 +602,7 @@ EXTERN char * TclpInetNtoa(struct in_addr); * known-to-be-MT-unsafe library calls. * Instead of returning pointers to the * static storage, those return pointers - * to the TSD data. + * to the TSD data. */ #include <pwd.h> diff --git a/win/tclWinPort.h b/win/tclWinPort.h index bca0b7e..93eca70 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinPort.h,v 1.50 2007/12/13 15:28:44 dgp Exp $ + * RCS: @(#) $Id: tclWinPort.h,v 1.51 2009/07/22 19:54:49 nijtmans Exp $ */ #ifndef _TCLWINPORT @@ -403,7 +403,7 @@ #ifdef __WATCOMC__ - /* + /* * OpenWatcom uses a wine derived winsock2.h that is missing the * LPFN_* typedefs. */ @@ -425,15 +425,9 @@ /* - * There is no platform-specific panic routine for Windows in the Tcl internals. - */ - -#define TclpPanic ((Tcl_PanicProc *) NULL) - -/* *--------------------------------------------------------------------------- - * The following macros and declarations represent the interface between - * generic and windows-specific parts of Tcl. Some of the macros may + * The following macros and declarations represent the interface between + * generic and windows-specific parts of Tcl. Some of the macros may * override functions declared in tclInt.h. *--------------------------------------------------------------------------- */ @@ -507,14 +501,14 @@ /* - * The following macros have trivial definitions, allowing generic code to + * The following macros have trivial definitions, allowing generic code to * address platform-specific issues. */ #define TclpReleaseFile(file) ckfree((char *) file) /* - * The following macros and declarations wrap the C runtime library + * The following macros and declarations wrap the C runtime library * functions. */ |