From b32ac06e6c6eecabdceefee25539d048dcfb00fe Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 28 Sep 2001 01:21:52 +0000 Subject: * More CONST poisoning fixes from the 2001-09-24 TIP 27 changes. CONST-ified Tcl_FSLoadFile and TclpLoadFile. Report and patch from Kevin Kenny. [Bug 465833] --- ChangeLog | 15 +++++++++++++++ doc/FileSystem.3 | 10 +++++----- generic/tcl.decls | 4 ++-- generic/tcl.h | 5 +++-- generic/tclDecls.h | 7 ++++--- generic/tclIOUtil.c | 9 +++++---- generic/tclInt.h | 5 +++-- generic/tclLoadNone.c | 4 ++-- generic/tclTest.c | 4 ++-- library/ldAout.tcl | 4 ++-- mac/tclMacLoad.c | 5 +++-- unix/tclLoadAout.c | 6 +++--- unix/tclLoadDl.c | 4 ++-- unix/tclLoadDld.c | 4 ++-- unix/tclLoadDyld.c | 4 ++-- unix/tclLoadNext.c | 4 ++-- unix/tclLoadOSF.c | 4 ++-- unix/tclLoadShl.c | 4 ++-- win/tclWinFCmd.c | 6 +++--- win/tclWinLoad.c | 4 ++-- 20 files changed, 66 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6706ad..bfa8c79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2001-09-27 Don Porter + * doc/FileSystem.3 (Tcl_FSLoadFile): + * generic/tcl.decls (Tcl_FSLoadFile): + * generic/tcl{Int}.h (Tcl_FSLoadFileProc,TclpLoadFile): + * generic/tclIOUtil.c (Tcl_FSLoadFile): + * generic/tclLoadNone.c (TclpLoadFile): + * generic/tclTest.c (TestReportLoadFile): + * library/ldAout.tcl: + * mac/tclMacLoad.c (TclpLoadFile): + * unix/tclLoad*.c (TclpLoadFile): + * win/tclWinLoad.c (TclpLoadFile): + * win/tclWinFCmd.c (DoRemoveJustDirectory): More CONST poisoning + fixes from the 2001-09-24 TIP 27 changes. CONST-ified + Tcl_FSLoadFile and TclpLoadFile. Report and patch from Kevin + Kenny. [Bug 465833] + * generic/tclIO.c (ChannelTimerProc): Added Tcl_Preserve() and Tcl_Release() to fix segfault introduced by the 2001-09-26 changes. [Bug 465494] diff --git a/doc/FileSystem.3 b/doc/FileSystem.3 index 97f1a78..6f9a4e8 100644 --- a/doc/FileSystem.3 +++ b/doc/FileSystem.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: FileSystem.3,v 1.6 2001/09/08 14:05:09 vincentdarley Exp $ +'\" RCS: @(#) $Id: FileSystem.3,v 1.7 2001/09/28 01:21:53 dgp Exp $ '\" .so man.macros .TH Tcl_FSCopyFile 3 8.4 Tcl "Tcl Library Procedures" @@ -180,9 +180,9 @@ write and execute permissions, respectively. F_OK just requests checking for the existence of the file. .AP stat *statPtr out The structure that contains the result of a stat or lstat operation. -.AP char *sym1 in +.AP "CONST char" *sym1 in Name of a procedure to look up in the file's symbol table -.AP char *sym2 in +.AP "CONST char" *sym2 in Name of a procedure to look up in the file's symbol table .AP Tcl_PackageInitProc **proc1Ptr out Filled with the init function for this code. @@ -1150,8 +1150,8 @@ entirely. typedef int Tcl_FSLoadFileProc( Tcl_Interp * \fIinterp\fR, Tcl_Obj *\fIpathPtr\fR, - char * \fIsym1\fR, - char * \fIsym2\fR, + CONST char * \fIsym1\fR, + CONST char * \fIsym2\fR, Tcl_PackageInitProc ** \fIproc1Ptr\fR, Tcl_PackageInitProc ** \fIproc2Ptr\fR, ClientData * \fIclientDataPtr\fR, diff --git a/generic/tcl.decls b/generic/tcl.decls index a391879..d999073 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -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: tcl.decls,v 1.62 2001/09/27 20:32:35 dgp Exp $ +# RCS: @(#) $Id: tcl.decls,v 1.63 2001/09/28 01:21:53 dgp Exp $ library tcl @@ -1560,7 +1560,7 @@ declare 443 generic { } declare 444 generic { int Tcl_FSLoadFile(Tcl_Interp * interp, \ - Tcl_Obj *pathPtr, char * sym1, char * sym2, \ + Tcl_Obj *pathPtr, CONST char * sym1, CONST char * sym2, \ Tcl_PackageInitProc ** proc1Ptr, \ Tcl_PackageInitProc ** proc2Ptr, \ ClientData * clientDataPtr, \ diff --git a/generic/tcl.h b/generic/tcl.h index 32b47c8..c2a4dcb 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -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: tcl.h,v 1.102 2001/09/17 21:32:30 hobbs Exp $ + * RCS: @(#) $Id: tcl.h,v 1.103 2001/09/28 01:21:53 dgp Exp $ */ #ifndef _TCL @@ -1543,7 +1543,8 @@ typedef int (Tcl_FSFileAttrsSetProc) _ANSI_ARGS_((Tcl_Interp *interp, typedef Tcl_Obj* (Tcl_FSLinkProc) _ANSI_ARGS_((Tcl_Obj *pathPtr, Tcl_Obj *toPtr)); typedef int (Tcl_FSLoadFileProc) _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj *pathPtr, char * sym1, char * sym2, + Tcl_Obj *pathPtr, + CONST char * sym1, CONST char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, ClientData * clientDataPtr, diff --git a/generic/tclDecls.h b/generic/tclDecls.h index c7621b4..06e90cf 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.62 2001/09/27 20:32:35 dgp Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.63 2001/09/28 01:21:53 dgp Exp $ */ #ifndef _TCLDECLS @@ -1392,7 +1392,8 @@ EXTERN int Tcl_FSCreateDirectory _ANSI_ARGS_((Tcl_Obj * pathPtr)); EXTERN int Tcl_FSDeleteFile _ANSI_ARGS_((Tcl_Obj * pathPtr)); /* 444 */ EXTERN int Tcl_FSLoadFile _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj * pathPtr, char * sym1, char * sym2, + Tcl_Obj * pathPtr, CONST char * sym1, + CONST char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, ClientData * clientDataPtr, @@ -2009,7 +2010,7 @@ typedef struct TclStubs { int (*tcl_FSCopyDirectory) _ANSI_ARGS_((Tcl_Obj * srcPathPtr, Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr)); /* 441 */ int (*tcl_FSCreateDirectory) _ANSI_ARGS_((Tcl_Obj * pathPtr)); /* 442 */ int (*tcl_FSDeleteFile) _ANSI_ARGS_((Tcl_Obj * pathPtr)); /* 443 */ - int (*tcl_FSLoadFile) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * pathPtr, char * sym1, char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, ClientData * clientDataPtr, Tcl_FSUnloadFileProc ** unloadProcPtr)); /* 444 */ + int (*tcl_FSLoadFile) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * pathPtr, CONST char * sym1, CONST char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, ClientData * clientDataPtr, Tcl_FSUnloadFileProc ** unloadProcPtr)); /* 444 */ int (*tcl_FSMatchInDirectory) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * result, Tcl_Obj * pathPtr, char * pattern, Tcl_GlobTypeData * types)); /* 445 */ Tcl_Obj* (*tcl_FSLink) _ANSI_ARGS_((Tcl_Obj * pathPtr, Tcl_Obj * toPtr)); /* 446 */ int (*tcl_FSRemoveDirectory) _ANSI_ARGS_((Tcl_Obj * pathPtr, int recursive, Tcl_Obj ** errorPtr)); /* 447 */ diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 771b139..f2f3497 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -17,7 +17,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIOUtil.c,v 1.20 2001/09/08 14:05:09 vincentdarley Exp $ + * RCS: @(#) $Id: tclIOUtil.c,v 1.21 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -2236,7 +2236,7 @@ Tcl_FSLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding @@ -2300,8 +2300,9 @@ Tcl_FSLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, FsDivertLoad *tvdlPtr; int retVal; - retVal = Tcl_FSLoadFile(interp, copyToPtr, sym1, sym2, proc1Ptr, - proc2Ptr, &newClientData, &newUnloadProcPtr); + retVal = Tcl_FSLoadFile(interp, copyToPtr, sym1, sym2, + proc1Ptr, proc2Ptr, &newClientData, + &newUnloadProcPtr); if (retVal == -1) { /* The file didn't load successfully */ Tcl_FSDeleteFile(copyToPtr); diff --git a/generic/tclInt.h b/generic/tclInt.h index bdb1f87..8e60370 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -11,7 +11,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.67 2001/09/27 20:32:35 dgp Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.68 2001/09/28 01:21:53 dgp Exp $ */ #ifndef _TCLINT @@ -1790,7 +1790,8 @@ EXTERN void TclpInitLock _ANSI_ARGS_((void)); EXTERN void TclpInitPlatform _ANSI_ARGS_((void)); EXTERN void TclpInitUnlock _ANSI_ARGS_((void)); EXTERN int TclpLoadFile _ANSI_ARGS_((Tcl_Interp *interp, - Tcl_Obj *pathPtr, char *sym1, char *sym2, + Tcl_Obj *pathPtr, + CONST char *sym1, CONST char *sym2, Tcl_PackageInitProc **proc1Ptr, Tcl_PackageInitProc **proc2Ptr, ClientData *clientDataPtr, diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c index 97b18b8..28c32bb 100644 --- a/generic/tclLoadNone.c +++ b/generic/tclLoadNone.c @@ -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: tclLoadNone.c,v 1.5 2001/08/30 08:53:15 vincentdarley Exp $ + * RCS: @(#) $Id: tclLoadNone.c,v 1.6 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -39,7 +39,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr) Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/generic/tclTest.c b/generic/tclTest.c index e1f7cdb..995ed27 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTest.c,v 1.31 2001/09/20 01:00:10 hobbs Exp $ + * RCS: @(#) $Id: tclTest.c,v 1.32 2001/09/28 01:21:53 dgp Exp $ */ #define TCL_TEST @@ -5404,7 +5404,7 @@ TestReportLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *fileName; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/library/ldAout.tcl b/library/ldAout.tcl index e602e3a..243c6d4 100644 --- a/library/ldAout.tcl +++ b/library/ldAout.tcl @@ -18,7 +18,7 @@ # its .o file placed before all others in the command; then # "ld" is executed to bind the objects together. # -# RCS: @(#) $Id: ldAout.tcl,v 1.4 1999/08/19 02:59:40 hobbs Exp $ +# RCS: @(#) $Id: ldAout.tcl,v 1.5 2001/09/28 01:21:53 dgp Exp $ # # Copyright (c) 1995, by General Electric Company. All rights reserved. # @@ -182,7 +182,7 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { append C {typedef int Tcl_PackageInitProc (Tcl_Interp *);} \n append C {Tcl_PackageInitProc *} \n append C TclLoadDictionary_ $modName { (symbol)} \n - append C { char * symbol;} \n + append C { CONST char * symbol;} \n append C { { int i; diff --git a/mac/tclMacLoad.c b/mac/tclMacLoad.c index ef9da8e..f3419f2 100644 --- a/mac/tclMacLoad.c +++ b/mac/tclMacLoad.c @@ -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: tclMacLoad.c,v 1.6 2001/09/04 18:06:34 vincentdarley Exp $ + * RCS: @(#) $Id: tclMacLoad.c,v 1.7 2001/09/28 01:21:53 dgp Exp $ */ #include @@ -101,7 +101,8 @@ TclpLoadFile( Tcl_Interp *interp, /* Used for error reporting. */ Tcl_Obj *pathPtr, /* Name of the file containing the desired * code. */ - char *sym1, char *sym2, /* Names of two procedures to look up in + CONST char *sym1, + CONST char *sym2, /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, Tcl_PackageInitProc **proc2Ptr, diff --git a/unix/tclLoadAout.c b/unix/tclLoadAout.c index ddc5316..4e6a196 100644 --- a/unix/tclLoadAout.c +++ b/unix/tclLoadAout.c @@ -14,7 +14,7 @@ * and Design Engineering (MADE) Initiative through ARPA contract * F33615-94-C-4400. * - * RCS: @(#) $Id: tclLoadAout.c,v 1.6 2001/09/04 18:06:34 vincentdarley Exp $ + * RCS: @(#) $Id: tclLoadAout.c,v 1.7 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -84,7 +84,7 @@ static char * SymbolTableFile = NULL; * Type of the dictionary function that begins each load module. */ -typedef Tcl_PackageInitProc * (* DictFn) _ANSI_ARGS_ ((char * symbol)); +typedef Tcl_PackageInitProc * (* DictFn) _ANSI_ARGS_ ((CONST char * symbol)); /* * Prototypes for procedures referenced only in this file: @@ -141,7 +141,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code (UTF-8). */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c index 7eeaefa..97d4c23 100644 --- a/unix/tclLoadDl.c +++ b/unix/tclLoadDl.c @@ -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: tclLoadDl.c,v 1.6 2001/09/24 21:10:32 dgp Exp $ + * RCS: @(#) $Id: tclLoadDl.c,v 1.7 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -62,7 +62,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/unix/tclLoadDld.c b/unix/tclLoadDld.c index ecf5b12..faa68ce 100644 --- a/unix/tclLoadDld.c +++ b/unix/tclLoadDld.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: tclLoadDld.c,v 1.5 2001/09/04 18:06:34 vincentdarley Exp $ + * RCS: @(#) $Id: tclLoadDld.c,v 1.6 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -54,7 +54,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c index aed76ff..3fde4b9 100644 --- a/unix/tclLoadDyld.c +++ b/unix/tclLoadDyld.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: tclLoadDyld.c,v 1.4 2001/09/04 18:06:34 vincentdarley Exp $ + * RCS: @(#) $Id: tclLoadDyld.c,v 1.5 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -45,7 +45,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c index 17f124b..9bdca2a 100644 --- a/unix/tclLoadNext.c +++ b/unix/tclLoadNext.c @@ -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: tclLoadNext.c,v 1.5 2001/09/04 18:06:34 vincentdarley Exp $ + * RCS: @(#) $Id: tclLoadNext.c,v 1.6 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -44,7 +44,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c index cdaf92c..dcf6fb2 100644 --- a/unix/tclLoadOSF.c +++ b/unix/tclLoadOSF.c @@ -31,7 +31,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclLoadOSF.c,v 1.5 2001/09/04 18:06:34 vincentdarley Exp $ + * RCS: @(#) $Id: tclLoadOSF.c,v 1.6 2001/09/28 01:21:53 dgp Exp $ */ #include "tclInt.h" @@ -65,7 +65,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c index b99ecad..24bd911 100644 --- a/unix/tclLoadShl.c +++ b/unix/tclLoadShl.c @@ -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: tclLoadShl.c,v 1.7 2001/09/10 21:18:19 dgp Exp $ + * RCS: @(#) $Id: tclLoadShl.c,v 1.8 2001/09/28 01:21:53 dgp Exp $ */ #include @@ -52,7 +52,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index 1832a76..5981ac2 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinFCmd.c,v 1.12 2001/09/04 18:06:35 vincentdarley Exp $ + * RCS: @(#) $Id: tclWinFCmd.c,v 1.13 2001/09/28 01:21:53 dgp Exp $ */ #include "tclWinInt.h" @@ -832,13 +832,13 @@ DoRemoveJustDirectory( */ if (TclWinGetPlatformId() != VER_PLATFORM_WIN32_NT) { - char *path, *find; + CONST char *path, *find; HANDLE handle; WIN32_FIND_DATAA data; Tcl_DString buffer; int len; - path = (char *) nativePath; + path = (CONST char *) nativePath; Tcl_DStringInit(&buffer); len = strlen(path); diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c index 50d14c9..8fe1e31 100644 --- a/win/tclWinLoad.c +++ b/win/tclWinLoad.c @@ -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: tclWinLoad.c,v 1.8 2001/09/04 18:06:35 vincentdarley Exp $ + * RCS: @(#) $Id: tclWinLoad.c,v 1.9 2001/09/28 01:21:53 dgp Exp $ */ #include "tclWinInt.h" @@ -41,7 +41,7 @@ TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, Tcl_Interp *interp; /* Used for error reporting. */ Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ - char *sym1, *sym2; /* Names of two procedures to look up in + CONST char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ Tcl_PackageInitProc **proc1Ptr, **proc2Ptr; /* Where to return the addresses corresponding -- cgit v0.12