diff options
| -rw-r--r-- | generic/tclBasic.c | 4 | ||||
| -rw-r--r-- | generic/tclCmdIL.c | 2 | ||||
| -rw-r--r-- | generic/tclCmdMZ.c | 9 | ||||
| -rw-r--r-- | generic/tclCompExpr.c | 4 | ||||
| -rw-r--r-- | generic/tclCompile.h | 6 |
5 files changed, 13 insertions, 12 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index b09007a..1ee1a8d 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -1382,8 +1382,8 @@ TclRegisterCommandTypeName( int isNew; hPtr = Tcl_CreateHashEntry(&commandTypeTable, - implementationProc, &isNew); - Tcl_SetHashValue(hPtr, (void *) nameStr); + (void *)implementationProc, &isNew); + Tcl_SetHashValue(hPtr, nameStr); } else { hPtr = Tcl_FindHashEntry(&commandTypeTable, implementationProc); diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 60b6df9..5e732c5 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -1607,7 +1607,7 @@ InfoLevelCmd( } for (framePtr=iPtr->varFramePtr ; framePtr!=rootFramePtr; framePtr=framePtr->callerVarPtr) { - if ((int)framePtr->level == level) { + if (framePtr->level == level) { break; } } diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index ba2603b..439d05c 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -132,7 +132,8 @@ Tcl_RegexpObjCmd( Tcl_Obj *const objv[]) /* Argument objects. */ { Tcl_Size offset, stringLength, matchLength, cflags, eflags; - int i, indices, match, about, all, doinline, numMatchesSaved; + Tcl_Size i; + int indices, match, about, all, doinline, numMatchesSaved; Tcl_RegExp regExpr; Tcl_Obj *objPtr, *startIndex = NULL, *resultPtr = NULL; Tcl_RegExpInfo info; @@ -377,7 +378,7 @@ Tcl_RegexpObjCmd( * area. (Scriptics Bug 4391/SF Bug #219232) */ - if (i <= (int)info.nsubs && info.matches[i].start >= 0) { + if (i <= info.nsubs && info.matches[i].start >= 0) { start = offset + info.matches[i].start; end = offset + info.matches[i].end; @@ -399,7 +400,7 @@ Tcl_RegexpObjCmd( newPtr = Tcl_NewListObj(2, objs); } else { - if ((i <= (int)info.nsubs) && (info.matches[i].end > 0)) { + if ((i <= info.nsubs) && (info.matches[i].end > 0)) { newPtr = Tcl_GetRange(objPtr, offset + info.matches[i].start, offset + info.matches[i].end - 1); @@ -4299,7 +4300,7 @@ Tcl_TimeRateObjCmd( maxms = -1000; do { lastMeasureOverhead = measureOverhead; - TclNewIntObj(clobjv[i], (int) maxms); + TclNewIntObj(clobjv[i], maxms); Tcl_IncrRefCount(clobjv[i]); result = Tcl_TimeRateObjCmd(NULL, interp, i + 1, clobjv); Tcl_DecrRefCount(clobjv[i]); diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index cb15eec..d0042a0 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -1798,7 +1798,7 @@ ConvertTreeToTokens( */ subExprTokenPtr->numComponents = - ((int)parsePtr->numTokens - subExprTokenIdx) - 1; + (parsePtr->numTokens - subExprTokenIdx) - 1; /* * Finally, as we return up the tree to our parent, pop the @@ -2690,7 +2690,7 @@ TclSortingOpCmd( lastAnd = j; } - litObjv[2 *(objc - 2) - 1] = objv[objc - 1]; + litObjv[2 * (objc - 2) - 1] = objv[objc - 1]; nodes[2 * (objc - 2) - 1].lexeme = lexeme; nodes[2 * (objc - 2) - 1].mark = MARK_LEFT; diff --git a/generic/tclCompile.h b/generic/tclCompile.h index 171dcb8..7f2596a 100644 --- a/generic/tclCompile.h +++ b/generic/tclCompile.h @@ -1878,12 +1878,12 @@ TokenAfter( * of LOOP ranges is an interesting datum for debugging purposes, and that is * what we compute now. * - * static int ExceptionRangeStarts(CompileEnv *envPtr, Tcl_Size index); + * static Tcl_Size ExceptionRangeStarts(CompileEnv *envPtr, Tcl_Size index); * static void ExceptionRangeEnds(CompileEnv *envPtr, Tcl_Size index); * static void ExceptionRangeTarget(CompileEnv *envPtr, Tcl_Size index, LABEL); */ -static inline int +static inline Tcl_Size ExceptionRangeStarts( CompileEnv *envPtr, Tcl_ExceptionRange index) @@ -1895,7 +1895,7 @@ ExceptionRangeStarts( envPtr->maxExceptDepth); offset = CurrentOffset(envPtr); envPtr->exceptArrayPtr[index].codeOffset = offset; - return (int) offset; + return offset; } static inline void |