Merge 8.7

5 files changed, 16 insertions, 16 deletions

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index d6e98a5..d2f30dd 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -1466,7 +1466,7 @@ FileAttrSizeCmd(
     if (GetStatBuf(interp, objv[1], Tcl_FSStat, &buf) != TCL_OK) {
 	return TCL_ERROR;
     }
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt) buf.st_size));
+    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(buf.st_size));
     return TCL_OK;
 }
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index e899635..d3f397b 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -9430,7 +9430,7 @@ TclCopyChannel(
     csPtr->readFlags = readFlags;
     csPtr->writeFlags = writeFlags;
     csPtr->toRead = toRead;
-    csPtr->total = (Tcl_WideInt) 0;
+    csPtr->total = 0;
     csPtr->interp = interp;
     if (cmdPtr) {
 	Tcl_IncrRefCount(cmdPtr);
@@ -9753,7 +9753,7 @@ CopyData(
 	Tcl_IncrRefCount(bufObj);
     }
 
-    while (csPtr->toRead != (Tcl_WideInt) 0) {
+    while (csPtr->toRead != 0) {
 	/*
 	 * Check for unreported background errors.
 	 */
@@ -9792,8 +9792,8 @@ CopyData(
 	     * Read up to bufSize characters.
 	     */
 
-	    if ((csPtr->toRead == (Tcl_WideInt) -1)
-		    || (csPtr->toRead > (Tcl_WideInt) csPtr->bufSize)) {
+	    if ((csPtr->toRead == -1)
+		    || (csPtr->toRead > (Tcl_WideInt)csPtr->bufSize)) {
 		sizeb = csPtr->bufSize;
 	    } else {
 		sizeb = csPtr->toRead;
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index be329d7..f8b7ddd 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -1909,7 +1909,7 @@ PropNameCompare(
     Tcl_Obj *first = *(Tcl_Obj **) a;
     Tcl_Obj *second = *(Tcl_Obj **) b;
 
-    return strcmp(Tcl_GetString(first), Tcl_GetString(second));
+    return strcmp(TclGetString(first), TclGetString(second));
 }
 
 static void
diff --git a/generic/tclTest.c b/generic/tclTest.c
index b224797..795310d 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -3539,7 +3539,7 @@ TestlinkCmd(
 		return TCL_ERROR;
 	    }
 	    Tcl_DecrRefCount(tmp);
-	    uwideVar = (Tcl_WideUInt) w;
+	    uwideVar = (Tcl_WideUInt)w;
 	}
     } else if (strcmp(argv[1], "update") == 0) {
 	int v;
@@ -3656,7 +3656,7 @@ TestlinkCmd(
 		return TCL_ERROR;
 	    }
 	    Tcl_DecrRefCount(tmp);
-	    uwideVar = (Tcl_WideUInt) w;
+	    uwideVar = (Tcl_WideUInt)w;
 	    Tcl_UpdateLinkedVar(interp, "uwide");
 	}
     } else {
@@ -6312,7 +6312,7 @@ TestChannelCmd(
 	}
 
 	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
-		(Tcl_WideInt) (size_t) Tcl_GetChannelThread(chan)));
+		(Tcl_WideInt)(size_t)Tcl_GetChannelThread(chan)));
 	return TCL_OK;
     }
 
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index ff360d6..0c11bb4 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1148,7 +1148,7 @@ int
 Tcl_ZlibStreamChecksum(
     Tcl_ZlibStream zshandle)	/* As obtained from Tcl_ZlibStreamInit */
 {
-    ZlibStreamHandle *zshPtr = (ZlibStreamHandle *) zshandle;
+    ZlibStreamHandle *zshPtr = (ZlibStreamHandle *)zshandle;
 
     return zshPtr->stream.adler;
 }
@@ -2018,8 +2018,8 @@ ZlibCmd(
 	if (objc < 4) {
 	    start = Tcl_ZlibAdler32(0, NULL, 0);
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
-		(uLong) Tcl_ZlibAdler32(start, data, dlen)));
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+		Tcl_ZlibAdler32(start, data, dlen)));
 	return TCL_OK;
     case CMD_CRC:		/* crc32 str ?startvalue?
 				 *	-> checksum */
@@ -2038,8 +2038,8 @@ ZlibCmd(
 	if (objc < 4) {
 	    start = Tcl_ZlibCRC32(0, NULL, 0);
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
-		(uLong) Tcl_ZlibCRC32(start, data, dlen)));
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+		Tcl_ZlibCRC32(start, data, dlen)));
 	return TCL_OK;
     case CMD_DEFLATE:		/* deflate data ?level?
 				 *	-> rawCompressedData */
@@ -2700,8 +2700,8 @@ ZlibStreamCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, NULL);
 	    return TCL_ERROR;
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
-		(uLong) Tcl_ZlibStreamChecksum(zstream)));
+	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+		Tcl_ZlibStreamChecksum(zstream)));
 	return TCL_OK;
     case zs_reset:		/* $strm reset */
 	if (objc != 2) {