diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-04-02 08:52:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-04-02 08:52:24 (GMT) |
| commit | 916d53022c1cb80653dd784240787473f0cf2822 (patch) | |
| tree | 433ecdbfa1f6c308c76598ab08af7329bae62fcb /generic/tclBasic.c | |
| parent | 583dd7c2a40bea817a8d6d2a2acf1e516e854edf (diff) | |
| download | tcl-916d53022c1cb80653dd784240787473f0cf2822.zip tcl-916d53022c1cb80653dd784240787473f0cf2822.tar.gz tcl-916d53022c1cb80653dd784240787473f0cf2822.tar.bz2 | |
Another round of -Wconversion fixes
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 73eb602..3cbf091 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -207,8 +207,8 @@ static Tcl_ObjCmdProc ExprSrandFunc; static Tcl_ObjCmdProc ExprUnaryFunc; static Tcl_ObjCmdProc ExprWideFunc; static Tcl_ObjCmdProc FloatClassifyObjCmd; -static void MathFuncWrongNumArgs(Tcl_Interp *interp, int expected, - int actual, Tcl_Obj *const *objv); +static void MathFuncWrongNumArgs(Tcl_Interp *interp, Tcl_Size expected, + Tcl_Size actual, Tcl_Obj *const *objv); static Tcl_NRPostProc NRCoroutineCallerCallback; static Tcl_NRPostProc NRCoroutineExitCallback; static Tcl_NRPostProc NRCommand; @@ -4437,7 +4437,7 @@ EvalObjvCore( TCL_UNUSED(int) /*result*/) { Command *cmdPtr = NULL, *preCmdPtr = (Command *)data[0]; - int flags = PTR2INT(data[1]); + int flags = (int)PTR2INT(data[1]); Tcl_Size objc = PTR2INT(data[2]); Tcl_Obj **objv = (Tcl_Obj **)data[3]; Interp *iPtr = (Interp *) interp; @@ -5179,7 +5179,7 @@ TclEvalEx( const char *p, *next; const int minObjs = 20; Tcl_Obj **objv, **objvSpace; - int *expand; + char *expand; Tcl_Size *lines, *lineSpace; Tcl_Token *tokenPtr; int expandRequested, code = TCL_OK; @@ -5196,7 +5196,7 @@ TclEvalEx( Tcl_Parse *parsePtr = (Tcl_Parse *)TclStackAlloc(interp, sizeof(Tcl_Parse)); CmdFrame *eeFramePtr = (CmdFrame *)TclStackAlloc(interp, sizeof(CmdFrame)); Tcl_Obj **stackObjArray = (Tcl_Obj **)TclStackAlloc(interp, minObjs * sizeof(Tcl_Obj *)); - int *expandStack = (int *)TclStackAlloc(interp, minObjs * sizeof(int)); + char *expandStack = (char *)TclStackAlloc(interp, minObjs * sizeof(char)); Tcl_Size *linesStack = (Tcl_Size *)TclStackAlloc(interp, minObjs * sizeof(Tcl_Size)); /* TIP #280 Structures for tracking of command * locations. */ @@ -5333,7 +5333,7 @@ TclEvalEx( */ if (numWords > minObjs) { - expand = (int *)Tcl_Alloc(numWords * sizeof(int)); + expand = (char *)Tcl_Alloc(numWords * sizeof(char)); objvSpace = (Tcl_Obj **) Tcl_Alloc(numWords * sizeof(Tcl_Obj *)); lineSpace = (Tcl_Size *) @@ -6293,7 +6293,7 @@ TEOEx_ByteCodeCallback( Interp *iPtr = (Interp *) interp; CallFrame *savedVarFramePtr = (CallFrame *)data[0]; Tcl_Obj *objPtr = (Tcl_Obj *)data[1]; - int allowExceptions = PTR2INT(data[2]); + int allowExceptions = (int)PTR2INT(data[2]); if (iPtr->numLevels == 0) { if (result == TCL_RETURN) { @@ -7770,7 +7770,7 @@ ExprRandFunc( * dividing by RAND_IM yields a double in the range (0, 1). */ - dResult = iPtr->randSeed * (1.0/RAND_IM); + dResult = (double)iPtr->randSeed * (1.0/RAND_IM); /* * Push a Tcl object with the result. @@ -8260,8 +8260,8 @@ FloatClassifyObjCmd( static void MathFuncWrongNumArgs( Tcl_Interp *interp, /* Tcl interpreter */ - int expected, /* Formal parameter count. */ - int found, /* Actual parameter count. */ + Tcl_Size expected, /* Formal parameter count. */ + Tcl_Size found, /* Actual parameter count. */ Tcl_Obj *const *objv) /* Actual parameter vector. */ { const char *name = TclGetString(objv[0]); |