From 8c64a9f5a97fbed1a4f84971bbb8abd04bf5dc41 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 17 Mar 2024 23:20:46 +0000
Subject: More int -> Tcl_Size

---
 generic/tclBasic.c   | 19 ++++++++++---------
 generic/tclCompile.h |  4 ++--
 generic/tclInt.h     |  2 +-
 generic/tclProc.c    |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 09839d7..32472ad 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4931,7 +4931,7 @@ Dispatch(
     }
     if (TCL_DTRACE_CMD_INFO_ENABLED() && iPtr->cmdFramePtr) {
 	Tcl_Obj *info = TclInfoFrame(interp, iPtr->cmdFramePtr);
-	const char *a[6]; int i[2];
+	const char *a[6]; Tcl_Size i[2];
 
 	TclDTraceInfo(info, a, i);
 	TCL_DTRACE_CMD_INFO(a[0], a[1], a[2], a[3], i[0], i[1], a[4], a[5]);
@@ -5183,7 +5183,7 @@ TEOV_NotFound(
 				 * namespace (TIP 181). */
     Namespace *savedNsPtr = NULL;
 
-    int qualLen;
+    Tcl_Size qualLen;
     const char *qualName = TclGetStringFromObj(objv[0], &qualLen);
 
     currNsPtr = varFramePtr->nsPtr;
@@ -5817,7 +5817,7 @@ TclEvalEx(
 			 */
 
 			Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
-				"\n    (expanding word %d)", objectsUsed));
+				"\n    (expanding word %" TCL_SIZE_MODIFIER "d)", objectsUsed));
 			Tcl_DecrRefCount(objv[objectsUsed]);
 			break;
 		    }
@@ -7352,7 +7352,7 @@ Tcl_AppendObjToErrorInfo(
 				 * pertains. */
     Tcl_Obj *objPtr)		/* Message to record. */
 {
-    int length;
+    Tcl_Size length;
     const char *message = TclGetStringFromObj(objPtr, &length);
 
     Tcl_IncrRefCount(objPtr);
@@ -7503,10 +7503,10 @@ Tcl_VarEvalVA(
 	if (string == NULL) {
 	    break;
 	}
-	Tcl_DStringAppend(&buf, string, -1);
+	Tcl_DStringAppend(&buf, string, TCL_INDEX_NONE);
     }
 
-    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), TCL_INDEX_NONE, 0);
     Tcl_DStringFree(&buf);
     return result;
 }
@@ -7577,7 +7577,7 @@ Tcl_GlobalEval(
 
     savedVarFramePtr = iPtr->varFramePtr;
     iPtr->varFramePtr = iPtr->rootFramePtr;
-    result = Tcl_EvalEx(interp, command, -1, 0);
+    result = Tcl_EvalEx(interp, command, TCL_INDEX_NONE, 0);
     iPtr->varFramePtr = savedVarFramePtr;
     return result;
 }
@@ -8299,7 +8299,8 @@ ExprMaxMinFunc(
 {
     Tcl_Obj *res;
     double d;
-    int type, i;
+    int type;
+    int i;
     void *ptr;
 
     if (objc < 2) {
@@ -9052,7 +9053,7 @@ void
 TclDTraceInfo(
     Tcl_Obj *info,
     const char **args,
-    int *argsi)
+    Tcl_Size *argsi)
 {
     static Tcl_Obj *keys[10] = { NULL };
     Tcl_Obj **k = keys, *val;
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 801b702..16bc972 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1762,7 +1762,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 #define TCL_DTRACE_DEBUG_LOG()
 
 MODULE_SCOPE void	TclDTraceInfo(Tcl_Obj *info, const char **args,
-			    int *argsi);
+			    Tcl_Size *argsi);
 
 #else /* USE_DTRACE */
 
@@ -1817,7 +1817,7 @@ MODULE_SCOPE void	TclDTraceInfo(Tcl_Obj *info, const char **args,
 MODULE_SCOPE int tclDTraceDebugEnabled, tclDTraceDebugIndent;
 MODULE_SCOPE FILE *tclDTraceDebugLog;
 MODULE_SCOPE void TclDTraceOpenDebugLog(void);
-MODULE_SCOPE void TclDTraceInfo(Tcl_Obj *info, const char **args, int *argsi);
+MODULE_SCOPE void TclDTraceInfo(Tcl_Obj *info, const char **args, Tcl_Size *argsi);
 
 #define TCL_DTRACE_DEBUG_LOG() \
     int tclDTraceDebugEnabled = TCL_DTRACE_DEBUG_LOG_ENABLED;	\
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 13e1c57..98f1494 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3299,7 +3299,7 @@ MODULE_SCOPE void	TclObjVarErrMsg(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 			    Tcl_Obj *part2Ptr, const char *operation,
 			    const char *reason, int index);
 MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[],
+			    Tcl_Size objc, Tcl_Obj *const objv[],
 			    Tcl_Namespace *nsPtr, int flags);
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 25a32ba..a35fe60 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1763,7 +1763,7 @@ TclNRInterpProcCore(
     }
     if (TCL_DTRACE_PROC_INFO_ENABLED() && iPtr->cmdFramePtr) {
 	Tcl_Obj *info = TclInfoFrame(interp, iPtr->cmdFramePtr);
-	const char *a[6]; int i[2];
+	const char *a[6]; Tcl_Size i[2];
 
 	TclDTraceInfo(info, a, i);
 	TCL_DTRACE_PROC_INFO(a[0], a[1], a[2], a[3], i[0], i[1], a[4], a[5]);
-- 
cgit v0.12