More int -> Tcl_Size, so (theoretically) longer lists could be handled. Thanks, Rolf!

6 files changed, 24 insertions, 15 deletions

diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index a34e80a..d26eb9c 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1533,7 +1533,7 @@ TclFileTempDirCmd(
     }
 
     if (objc > 1) {
-	int length;
+	Tcl_Size length;
 	Tcl_Obj *templateObj = objv[1];
 	const char *string = Tcl_GetStringFromObj(templateObj, &length);
 	const int onWindows = (tclPlatform == TCL_PLATFORM_WINDOWS);
diff --git a/generic/tclTest.c b/generic/tclTest.c
index e42d5e6..d829640 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2028,7 +2028,7 @@ static int UtfExtWrapper(
     int result;
     int flags;
     Tcl_Obj **flagObjs;
-    int nflags;
+    Tcl_Size nflags;
     static const struct {
 	const char *flagKey;
 	int flag;
@@ -2043,7 +2043,7 @@ static int UtfExtWrapper(
 	{"profilereplace", TCL_ENCODING_PROFILE_REPLACE},
 	{NULL, 0}
     };
-    int i;
+    Tcl_Size i;
     Tcl_WideInt wide;
 
     if (objc < 7 || objc > 10) {
@@ -2418,7 +2418,8 @@ TestevalexObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int length, flags;
+    int flags;
+    Tcl_Size length;
     const char *script;
 
     flags = 0;
@@ -3656,7 +3657,8 @@ TestlinkarrayCmd(
 	TCL_LINK_FLOAT, TCL_LINK_DOUBLE, TCL_LINK_STRING, TCL_LINK_CHARS,
 	TCL_LINK_BINARY
     };
-    int typeIndex, readonly, i, size, length;
+    int typeIndex, readonly, i, size;
+    Tcl_Size length;
     char *name, *arg;
     Tcl_WideInt addr;
 
@@ -4001,7 +4003,8 @@ TestparserObjCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     const char *script;
-    int length, dummy;
+    Tcl_Size dummy;
+    int length;
     Tcl_Parse parse;
 
     if (objc != 3) {
@@ -4057,7 +4060,8 @@ TestexprparserObjCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     const char *script;
-    int length, dummy;
+    Tcl_Size dummy;
+    int length;
     Tcl_Parse parse;
 
     if (objc != 3) {
@@ -4246,7 +4250,8 @@ TestparsevarnameObjCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     const char *script;
-    int append, length, dummy;
+    int length, append;
+    Tcl_Size dummy;
     Tcl_Parse parse;
 
     if (objc != 4) {
@@ -4379,8 +4384,8 @@ TestregexpObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, indices, stringLength, match, about;
-    Tcl_Size ii;
+    int i, indices, match, about;
+    Tcl_Size stringLength, ii;
     int hasxflags, cflags, eflags;
     Tcl_RegExp regExpr;
     const char *string;
@@ -5533,7 +5538,7 @@ TeststringbytesObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
-    int n;
+    Tcl_Size n;
     const unsigned char *p;
 
     if (objc != 2) {
@@ -7269,7 +7274,7 @@ static Tcl_Obj *
 SimpleRedirect(
     Tcl_Obj *pathPtr)		/* Name of file to copy. */
 {
-    int len;
+    Tcl_Size len;
     const char *str;
     Tcl_Obj *origPtr;
 
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index b24c639..26d33ce 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -899,7 +899,7 @@ TestlistobjCmd(
     Tcl_Size first;			/* First index in the list */
     Tcl_Size count;			/* Count of elements in a list */
     Tcl_Obj **varPtr;
-    int i, len;
+    Tcl_Size i, len;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg...?");
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index a5b079a..484c4e4 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -272,7 +272,8 @@ ThreadObjCmd(
     }
     case THREAD_CREATE: {
 	const char *script;
-	int joinable, len;
+	int joinable;
+	Tcl_Size len;
 
 	if (objc == 2) {
 	    /*
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index daeb424..4403562 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -269,7 +269,8 @@ Tcl_TraceObjCmd(
     case TRACE_OLD_VDELETE: {
 	Tcl_Obj *copyObjv[6];
 	Tcl_Obj *opsList;
-	int code, numFlags;
+	int code;
+	Tcl_Size numFlags;
 
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "name ops command");
diff --git a/win/Makefile.in b/win/Makefile.in
index 2255681..4eac43b 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -701,6 +701,8 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 
 tclEvent.${OBJEXT}: tclEvent.c tclUuid.h
 
+tclTest.${OBJEXT}: tclTest.c tclUuid.h
+
 $(TOP_DIR)/manifest.uuid:
 	printf "git-" >$(TOP_DIR)/manifest.uuid
 	(cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || \