diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | generic/tclBasic.c | 8 | ||||
| -rw-r--r-- | generic/tclCompCmds.c | 4 | ||||
| -rw-r--r-- | generic/tclFCmd.c | 4 | ||||
| -rw-r--r-- | generic/tclIOCmd.c | 4 | ||||
| -rw-r--r-- | generic/tclTrace.c | 4 |
6 files changed, 20 insertions, 12 deletions
@@ -1,3 +1,11 @@ +2007-06-28 Pat Thoyts <patthoyts@users.sourceforge.net> + + * generic/tclBasic.c: Silence constness warnings for + * generic/tclCompCmds.c: TclStackFree when building with msvc. + * generic/tclFCmd.c: + * generic/tclIOCmd.c: + * generic/tclTrace.c: + 2007-06-28 Miguel Sofer <msofer@users.sf.net> * generic/tclVar.c (UnsetVarStruct): fix possible segfault. diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 1d16328..9071782 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.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: tclBasic.c,v 1.258 2007/06/26 22:12:29 dgp Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.259 2007/06/28 21:10:37 patthoyts Exp $ */ #include "tclInt.h" @@ -2021,7 +2021,7 @@ TclInvokeStringCommand( result = (*cmdPtr->proc)(cmdPtr->clientData, interp, objc, argv); - TclStackFree(interp, argv); + TclStackFree(interp, (void *)argv); return result; } @@ -4042,7 +4042,7 @@ TclEvalEx( int objectsNeeded = 0; unsigned int numWords = parsePtr->numWords; - if (numWords > minObjs) { + if (numWords > (unsigned int)minObjs) { expand = (int *) ckalloc(numWords * sizeof(int)); objvSpace = (Tcl_Obj **) ckalloc(numWords * sizeof(Tcl_Obj *)); lineSpace = (int *) ckalloc(numWords * sizeof(int)); @@ -4116,7 +4116,7 @@ TclEvalEx( int wordIdx = numWords; int objIdx = objectsNeeded - 1; - if ((numWords > minObjs) + if ((numWords > (unsigned int)minObjs) || (objectsNeeded > minObjs)) { objv = objvSpace = (Tcl_Obj **) ckalloc((unsigned)objectsNeeded*sizeof(Tcl_Obj*)); diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c index 3801886..c50849b 100644 --- a/generic/tclCompCmds.c +++ b/generic/tclCompCmds.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: tclCompCmds.c,v 1.111 2007/06/20 18:46:11 dgp Exp $ + * RCS: @(#) $Id: tclCompCmds.c,v 1.112 2007/06/28 21:10:38 patthoyts Exp $ */ #include "tclInt.h" @@ -1665,7 +1665,7 @@ TclCompileForeachCmd( ckfree((char *) varvList[loopIndex]); } } - TclStackFree(interp, varvList); + TclStackFree(interp, (void *)varvList); TclStackFree(interp, varcList); return code; } diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c index 1cb3d3f..a9c1613 100644 --- a/generic/tclFCmd.c +++ b/generic/tclFCmd.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: tclFCmd.c,v 1.40 2007/06/20 18:46:12 dgp Exp $ + * RCS: @(#) $Id: tclFCmd.c,v 1.41 2007/06/28 21:10:38 patthoyts Exp $ */ #include "tclInt.h" @@ -1112,7 +1112,7 @@ TclFileAttrsCmd( * Free up the array we allocated. */ - TclStackFree(interp, attributeStrings); + TclStackFree(interp, (void *)attributeStrings); /* * We don't need this object that was passed to us any more. diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c index 8507eb2..ba610b5 100644 --- a/generic/tclIOCmd.c +++ b/generic/tclIOCmd.c @@ -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: tclIOCmd.c,v 1.41 2007/06/20 18:46:13 dgp Exp $ + * RCS: @(#) $Id: tclIOCmd.c,v 1.42 2007/06/28 21:10:38 patthoyts Exp $ */ #include "tclInt.h" @@ -872,7 +872,7 @@ Tcl_ExecObjCmd( * Free the argv array. */ - TclStackFree(interp, argv); + TclStackFree(interp, (void *)argv); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; diff --git a/generic/tclTrace.c b/generic/tclTrace.c index f4927f8..638893f 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -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: tclTrace.c,v 1.40 2007/06/27 18:21:52 dgp Exp $ + * RCS: @(#) $Id: tclTrace.c,v 1.41 2007/06/28 21:10:38 patthoyts Exp $ */ #include "tclInt.h" @@ -2281,7 +2281,7 @@ StringTraceProc( (data->proc)(data->clientData, interp, level, (char *) command, cmdPtr->proc, cmdPtr->clientData, objc, argv); - TclStackFree(interp, argv); + TclStackFree(interp, (void *)argv); return TCL_OK; } |