Merge 8.7

9 files changed, 29 insertions, 32 deletions

diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 97642f6..0d19543 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -2910,7 +2910,7 @@ CheckJumpTableLabels(
 	valEntryPtr = Tcl_FindHashEntry(&assemEnvPtr->labelHash,
 		TclGetString(symbolObj));
 	DEBUG_PRINT("  %s -> %s (%d)\n",
-		(char*) Tcl_GetHashKey(symHash, symEntryPtr),
+		(char *)Tcl_GetHashKey(symHash, symEntryPtr),
 		TclGetString(symbolObj), (valEntryPtr != NULL));
 	if (valEntryPtr == NULL) {
 	    ReportUndefinedLabel(assemEnvPtr, bbPtr, symbolObj);
@@ -3115,7 +3115,7 @@ ResolveJumpTableTargets(
 	realJumpEntryPtr = Tcl_CreateHashEntry(realJumpHashPtr,
 		Tcl_GetHashKey(symHash, symEntryPtr), &junk);
 	DEBUG_PRINT("  %s -> %s -> bb %p (pc %d)    hash entry %p\n",
-		(char*) Tcl_GetHashKey(symHash, symEntryPtr),
+		(char *)Tcl_GetHashKey(symHash, symEntryPtr),
 		TclGetString(symbolObj), jumpTargetBBPtr,
 		jumpTargetBBPtr->startOffset, realJumpEntryPtr);
 
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 5498883..276eda8 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -913,7 +913,7 @@ AddSimpleChainToCallContext(
 		    flags | TRAVERSED_MIXIN, filterDecl);
 	}
 	if (oPtr->methodsPtr && !blockedUnexported) {
-	    hPtr = Tcl_FindHashEntry(oPtr->methodsPtr, (char*) methodNameObj);
+	    hPtr = Tcl_FindHashEntry(oPtr->methodsPtr, (char *)methodNameObj);
 	    if (hPtr != NULL) {
 		mPtr = (Method *)Tcl_GetHashValue(hPtr);
 		if (!IS_PRIVATE(mPtr)) {
diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c
index b221191..9ff37cb 100644
--- a/generic/tclOODefineCmds.c
+++ b/generic/tclOODefineCmds.c
@@ -1845,10 +1845,10 @@ TclOODefineExportObjCmd(
 		Tcl_InitObjHashTable(oPtr->methodsPtr);
 		oPtr->flags &= ~USE_CLASS_CACHE;
 	    }
-	    hPtr = Tcl_CreateHashEntry(oPtr->methodsPtr, (char *) objv[i],
+	    hPtr = Tcl_CreateHashEntry(oPtr->methodsPtr, (char *)objv[i],
 		    &isNew);
 	} else {
-	    hPtr = Tcl_CreateHashEntry(&clsPtr->classMethods, (char*) objv[i],
+	    hPtr = Tcl_CreateHashEntry(&clsPtr->classMethods, (char *)objv[i],
 		    &isNew);
 	}
 
@@ -2158,10 +2158,10 @@ TclOODefineUnexportObjCmd(
 		Tcl_InitObjHashTable(oPtr->methodsPtr);
 		oPtr->flags &= ~USE_CLASS_CACHE;
 	    }
-	    hPtr = Tcl_CreateHashEntry(oPtr->methodsPtr, (char *) objv[i],
+	    hPtr = Tcl_CreateHashEntry(oPtr->methodsPtr, (char *)objv[i],
 		    &isNew);
 	} else {
-	    hPtr = Tcl_CreateHashEntry(&clsPtr->classMethods, (char*) objv[i],
+	    hPtr = Tcl_CreateHashEntry(&clsPtr->classMethods, (char *)objv[i],
 		    &isNew);
 	}
 
diff --git a/generic/tclTest.c b/generic/tclTest.c
index cfe989c..7ee0352 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1761,7 +1761,7 @@ TestdstringCmd(
 	    strcpy(s, "This is a malloc-ed string");
 	    Tcl_SetResult(interp, s, TCL_DYNAMIC);
 	} else if (strcmp(argv[2], "special") == 0) {
-	    char *s = (char*)Tcl_Alloc(100) + 16;
+	    char *s = (char *)Tcl_Alloc(100) + 16;
 	    strcpy(s, "This is a specially-allocated string");
 	    Tcl_SetResult(interp, s, SpecialFree);
 	} else {
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index a2ab24f..f3fea0c 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -610,7 +610,7 @@ TclpLoadMemory(
 
 	    if ((size_t) codeSize >= sizeof(struct fat_header) +
 		    fh_nfat_arch * sizeof(struct fat_arch)) {
-		void *fatarchs = (char*)buffer + sizeof(struct fat_header);
+		void *fatarchs = (char *)buffer + sizeof(struct fat_header);
 		const NXArchInfo *arch = NXGetLocalArchInfo();
 		struct fat_arch *fa;
 
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index d7f64bd..a088857 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -382,7 +382,7 @@ TclpGetGrNam(
 	if (tsdPtr->gbuflen < 1) {
 	    tsdPtr->gbuflen = 1024;
 	}
-	tsdPtr->gbuf = (char*)Tcl_Alloc(tsdPtr->gbuflen);
+	tsdPtr->gbuf = (char *)Tcl_Alloc(tsdPtr->gbuflen);
 	Tcl_CreateThreadExitHandler(FreeGrBuf, NULL);
     }
     while (1) {
@@ -462,7 +462,7 @@ TclpGetGrGid(
 	if (tsdPtr->gbuflen < 1) {
 	    tsdPtr->gbuflen = 1024;
 	}
-	tsdPtr->gbuf = (char*)Tcl_Alloc(tsdPtr->gbuflen);
+	tsdPtr->gbuf = (char *)Tcl_Alloc(tsdPtr->gbuflen);
 	Tcl_CreateThreadExitHandler(FreeGrBuf, NULL);
     }
     while (1) {
@@ -901,7 +901,7 @@ CopyArray(
 	return -1;
     }
 
-    newBuffer = (char **) buf;
+    newBuffer = (char **)buf;
     p = buf + len;
 
     for (j = 0; j < i; j++) {
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 396fa90..e64e182 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -729,7 +729,7 @@ TclpGetNativeCwd(
 #endif /* USEGETWD */
 
     if ((clientData == NULL) || strcmp(buffer, (const char *) clientData)) {
-	char *newCd = (char*)Tcl_Alloc(strlen(buffer) + 1);
+	char *newCd = (char *)Tcl_Alloc(strlen(buffer) + 1);
 
 	strcpy(newCd, buffer);
 	return newCd;
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 206e999..bb8f517 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -170,14 +170,14 @@ static pthread_mutex_t globalLock = PTHREAD_MUTEX_INITIALIZER;
 
 /*
  * initLock is used to serialize initialization and finalization of Tcl. It
- * cannot use any dyamically allocated storage.
+ * cannot use any dynamically allocated storage.
  */
 
 static pthread_mutex_t initLock = PTHREAD_MUTEX_INITIALIZER;
 
 /*
  * allocLock is used by Tcl's version of malloc for synchronization. For
- * obvious reasons, cannot use any dyamically allocated storage.
+ * obvious reasons, cannot use any dynamically allocated storage.
  */
 
 static PMutex allocLock;
@@ -258,12 +258,12 @@ TclpThreadCreate(
     }
 
     if (pthread_create(&theThread, &attr,
-	    (void * (*)(void *))(void *)proc, (void *) clientData) &&
+	    (void * (*)(void *))(void *)proc, (void *)clientData) &&
 	    pthread_create(&theThread, NULL,
-		    (void * (*)(void *))(void *)proc, (void *) clientData)) {
+		    (void * (*)(void *))(void *)proc, (void *)clientData)) {
 	result = TCL_ERROR;
     } else {
-	*idPtr = (Tcl_ThreadId) theThread;
+	*idPtr = (Tcl_ThreadId)theThread;
 	result = TCL_OK;
     }
     pthread_attr_destroy(&attr);
@@ -507,7 +507,7 @@ TclpGlobalUnlock(void)
  * Tcl_GetAllocMutex
  *
  *	This procedure returns a pointer to a statically initialized mutex for
- *	use by the memory allocator. The alloctor must use this lock, because
+ *	use by the memory allocator. The allocator must use this lock, because
  *	all other locks are allocated...
  *
  * Results:
@@ -686,8 +686,8 @@ Tcl_ConditionWait(
 	}
 	pthread_mutex_unlock(&globalLock);
     }
-    pmutexPtr = *((PMutex **) mutexPtr);
-    pcondPtr = *((pthread_cond_t **) condPtr);
+    pmutexPtr = *((PMutex **)mutexPtr);
+    pcondPtr = *((pthread_cond_t **)condPtr);
     if (timePtr == NULL) {
 	PCondWait(pcondPtr, pmutexPtr);
     } else {
@@ -729,7 +729,7 @@ void
 Tcl_ConditionNotify(
     Tcl_Condition *condPtr)
 {
-    pthread_cond_t *pcondPtr = *((pthread_cond_t **) condPtr);
+    pthread_cond_t *pcondPtr = *((pthread_cond_t **)condPtr);
 
     if (pcondPtr != NULL) {
 	pthread_cond_broadcast(pcondPtr);
@@ -763,7 +763,7 @@ void
 TclpFinalizeCondition(
     Tcl_Condition *condPtr)
 {
-    pthread_cond_t *pcondPtr = *(pthread_cond_t **) condPtr;
+    pthread_cond_t *pcondPtr = *(pthread_cond_t **)condPtr;
 
     if (pcondPtr != NULL) {
 	pthread_cond_destroy(pcondPtr);
@@ -804,7 +804,7 @@ void
 TclpFreeAllocMutex(
     Tcl_Mutex *mutex)		/* The alloc mutex to free. */
 {
-    AllocMutex *lockPtr = (AllocMutex *) mutex;
+    AllocMutex *lockPtr = (AllocMutex *)mutex;
 
     if (!lockPtr) {
 	return;
@@ -902,7 +902,7 @@ void *
 TclpThreadGetGlobalTSD(
     void *tsdKeyPtr)
 {
-    pthread_key_t *ptkeyPtr = (pthread_key_t*)tsdKeyPtr;
+    pthread_key_t *ptkeyPtr = (pthread_key_t *)tsdKeyPtr;
 
     return pthread_getspecific(*ptkeyPtr);
 }
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 7e20ee9..3f72ab2 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -1527,14 +1527,11 @@ ConsoleSetOptionProc(
 	} else {
 	    infoPtr->flags |= CONSOLE_RESET;
 	}
-	return TCL_OK;
-    }
-
-    if (infoPtr->flags & CONSOLE_READ_OPS) {
-	return Tcl_BadChannelOption(interp, optionName, "inputmode");
-    } else {
-	return Tcl_BadChannelOption(interp, optionName, "");
+    } else if (len > 0) {
+	return Tcl_BadChannelOption(interp, optionName,
+		(infoPtr->flags & CONSOLE_READ_OPS) ? "inputmode" : "");
     }
+    return TCL_OK;
 }
 
 /*