Merge 8.6. Use Tcl_NewBooleanObj for booleans; we should say what we mean

1 files changed, 46 insertions, 46 deletions

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 02607a4..ef13c5a 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -682,7 +682,7 @@ buildInfoObjCmd(
 	    if (p) {
 		memcpy(buf, (char *)clientData, p - (char *)clientData);
 		buf[p - (char *)clientData] = '\0';
-		Tcl_AppendResult(interp, buf, (void *)NULL);
+		Tcl_AppendResult(interp, buf, (char *)NULL);
 	    }
 	    return TCL_OK;
 	} else if (len == 10 && !strcmp(arg, "patchlevel")) {
@@ -691,7 +691,7 @@ buildInfoObjCmd(
 	    if (p) {
 		memcpy(buf, (char *)clientData, p - (char *)clientData);
 		buf[p - (char *)clientData] = '\0';
-		Tcl_AppendResult(interp, buf, (void *)NULL);
+		Tcl_AppendResult(interp, buf, (char *)NULL);
 	    }
 	    return TCL_OK;
 	} else if (len == 6 && !strcmp(arg, "commit")) {
@@ -701,9 +701,9 @@ buildInfoObjCmd(
 		    char buf[80];
 		    memcpy(buf, p+1, q - p - 1);
 		    buf[q - p - 1] = '\0';
-		    Tcl_AppendResult(interp, buf, (void *)NULL);
+		    Tcl_AppendResult(interp, buf, (char *)NULL);
 		} else {
-		    Tcl_AppendResult(interp, p+1, (void *)NULL);
+		    Tcl_AppendResult(interp, p+1, (char *)NULL);
 		}
 	    }
 	    return TCL_OK;
@@ -717,29 +717,29 @@ buildInfoObjCmd(
 			char buf[16];
 			memcpy(buf, p+1, q - p - 1);
 			buf[q - p - 1] = '\0';
-			Tcl_AppendResult(interp, buf, (void *)NULL);
+			Tcl_AppendResult(interp, buf, (char *)NULL);
 		    } else {
-			Tcl_AppendResult(interp, p+1, (void *)NULL);
+			Tcl_AppendResult(interp, p+1, (char *)NULL);
 		    }
 		    return TCL_OK;
 		}
 		p = strchr(p+1, '.');
 	    }
-	    Tcl_AppendResult(interp, "0", (void *)NULL);
+	    Tcl_AppendResult(interp, "0", (char *)NULL);
 	    return TCL_OK;
 	}
 	const char *p = strchr((char *)clientData, '.');
 	while (p) {
 	    if (!strncmp(p+1, arg, len) && ((p[len+1] == '.') || (p[len+1] == '\0'))) {
-		Tcl_AppendResult(interp, "1", (void *)NULL);
+		Tcl_AppendResult(interp, "1", (char *)NULL);
 		return TCL_OK;
 	    }
 	    p = strchr(p+1, '.');
 	}
-	Tcl_AppendResult(interp, "0", (void *)NULL);
+	Tcl_AppendResult(interp, "0", (char *)NULL);
 	return TCL_OK;
     }
-    Tcl_AppendResult(interp, (char *)clientData, (void *)NULL);
+    Tcl_AppendResult(interp, (char *)clientData, (char *)NULL);
     return TCL_OK;
 }
 
@@ -1517,7 +1517,7 @@ BadEnsembleSubcommand(
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
             "not allowed to invoke subcommand %s of %s",
             infoPtr->commandName, infoPtr->ensembleNsName));
-    Tcl_SetErrorCode(interp, "TCL", "SAFE", "SUBCOMMAND", (void *)NULL);
+    Tcl_SetErrorCode(interp, "TCL", "SAFE", "SUBCOMMAND", (char *)NULL);
     return TCL_ERROR;
 }
 
@@ -2223,7 +2223,7 @@ Tcl_HideCommand(
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"cannot use namespace qualifiers in hidden command"
 		" token (rename)", TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "VALUE", "HIDDENTOKEN", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "VALUE", "HIDDENTOKEN", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -2248,7 +2248,7 @@ Tcl_HideCommand(
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "can only hide global namespace commands (use rename then hide)",
                 TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "HIDE", "NON_GLOBAL", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "HIDE", "NON_GLOBAL", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -2274,7 +2274,7 @@ Tcl_HideCommand(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "hidden command named \"%s\" already exists",
                 hiddenCmdToken));
-        Tcl_SetErrorCode(interp, "TCL", "HIDE", "ALREADY_HIDDEN", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "HIDE", "ALREADY_HIDDEN", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -2378,7 +2378,7 @@ Tcl_ExposeCommand(
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "cannot expose to a namespace (use expose to toplevel, then rename)",
                 TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "EXPOSE", "NON_GLOBAL", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "EXPOSE", "NON_GLOBAL", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -2395,7 +2395,7 @@ Tcl_ExposeCommand(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "unknown hidden command \"%s\"", hiddenCmdToken));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "HIDDENTOKEN",
-                hiddenCmdToken, (void *)NULL);
+                hiddenCmdToken, (char *)NULL);
 	return TCL_ERROR;
     }
     cmdPtr = (Command *)Tcl_GetHashValue(hPtr);
@@ -2433,7 +2433,7 @@ Tcl_ExposeCommand(
     if (!isNew) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "exposed command \"%s\" already exists", cmdName));
-        Tcl_SetErrorCode(interp, "TCL", "EXPOSE", "COMMAND_EXISTS", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "EXPOSE", "COMMAND_EXISTS", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -3113,7 +3113,7 @@ TclRenameCommand(
                 "can't %s \"%s\": command doesn't exist",
 		((newName == NULL)||(*newName == '\0'))? "delete":"rename",
 		oldName));
-        Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COMMAND", oldName, (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COMMAND", oldName, (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -3144,7 +3144,7 @@ TclRenameCommand(
     if ((newNsPtr == NULL) || (newTail == NULL)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "can't rename to \"%s\": bad command name", newName));
-        Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", (char *)NULL);
 	result = TCL_ERROR;
 	goto done;
     }
@@ -3152,7 +3152,7 @@ TclRenameCommand(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "can't rename to \"%s\": command already exists", newName));
         Tcl_SetErrorCode(interp, "TCL", "OPERATION", "RENAME",
-                "TARGET_EXISTS", (void *)NULL);
+                "TARGET_EXISTS", (char *)NULL);
 	result = TCL_ERROR;
 	goto done;
     }
@@ -4269,7 +4269,7 @@ Tcl_GetMathFuncInfo(
     if (cmdPtr == NULL) {
         Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "unknown math function \"%s\"", name));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "MATHFUNC", name, (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "MATHFUNC", name, (char *)NULL);
 	*numArgsPtr = -1;
 	*argTypesPtr = NULL;
 	*procPtr = NULL;
@@ -4388,7 +4388,7 @@ TclInterpReady(
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"attempt to call eval in deleted interpreter", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "IDELETE",
-		"attempt to call eval in deleted interpreter", (void *)NULL);
+		"attempt to call eval in deleted interpreter", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -4416,7 +4416,7 @@ TclInterpReady(
 
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
 	    "too many nested evaluations (infinite loop?)", TCL_INDEX_NONE));
-    Tcl_SetErrorCode(interp, "TCL", "LIMIT", "STACK", (void *)NULL);
+    Tcl_SetErrorCode(interp, "TCL", "LIMIT", "STACK", (char *)NULL);
     return TCL_ERROR;
 }
 
@@ -4550,7 +4550,7 @@ Tcl_Canceled(
         }
 
         Tcl_SetObjResult(interp, Tcl_NewStringObj(message, TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "CANCEL", id, message, (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "CANCEL", id, message, (char *)NULL);
     }
 
     /*
@@ -4840,7 +4840,7 @@ EvalObjvCore(
 
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "attempt to invoke a deleted command"));
-	    Tcl_SetErrorCode(interp, "TCL", "EVAL", "DELETEDCOMMAND", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "EVAL", "DELETEDCOMMAND", (char *)NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -5239,7 +5239,7 @@ TEOV_NotFound(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "invalid command name \"%s\"", TclGetString(objv[0])));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COMMAND",
-                TclGetString(objv[0]), (void *)NULL);
+                TclGetString(objv[0]), (char *)NULL);
 
 	/*
 	 * Release any resources we locked and allocated during the handler
@@ -6848,7 +6848,7 @@ ProcessUnexpectedResult(
 		"command returned bad code: %d", returnCode));
     }
     snprintf(buf, sizeof(buf), "%d", returnCode);
-    Tcl_SetErrorCode(interp, "TCL", "UNEXPECTED_RESULT_CODE", buf, (void *)NULL);
+    Tcl_SetErrorCode(interp, "TCL", "UNEXPECTED_RESULT_CODE", buf, (char *)NULL);
 }
 
 /*
@@ -7196,7 +7196,7 @@ TclNRInvoke(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "invalid hidden command name \"%s\"", cmdName));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "HIDDENTOKEN", cmdName,
-                (void *)NULL);
+                (char *)NULL);
 	return TCL_ERROR;
     }
     cmdPtr = (Command *)Tcl_GetHashValue(hPtr);
@@ -7403,7 +7403,7 @@ Tcl_AddObjErrorInfo(
 	    iPtr->errorInfo = iPtr->objResultPtr;
 	Tcl_IncrRefCount(iPtr->errorInfo);
 	if (!iPtr->errorCode) {
-	    Tcl_SetErrorCode(interp, "NONE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "NONE", (char *)NULL);
 	}
     }
 
@@ -7840,7 +7840,7 @@ ExprIsqrtFunc(
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
             "square root of negative argument", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
-	    "domain error: argument not in valid range", (void *)NULL);
+	    "domain error: argument not in valid range", (char *)NULL);
     return TCL_ERROR;
 }
 
@@ -8950,7 +8950,7 @@ MathFuncWrongNumArgs(
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "%s arguments for math function \"%s\"",
 	    (found < expected ? "not enough" : "too many"), name));
-    Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", (void *)NULL);
+    Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", (char *)NULL);
 }
 
 #ifdef USE_DTRACE
@@ -9371,7 +9371,7 @@ TclNRTailcallObjCmd(
     if (!(iPtr->varFramePtr->isProcCallFrame & 1)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "tailcall can only be called from a proc, lambda or method", TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "TAILCALL", "ILLEGAL", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "TAILCALL", "ILLEGAL", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -9533,7 +9533,7 @@ TclNRYieldObjCmd(
     if (!corPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "yield can only be called in a coroutine", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -9566,7 +9566,7 @@ TclNRYieldToObjCmd(
     if (!corPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "yieldto can only be called in a coroutine", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -9574,7 +9574,7 @@ TclNRYieldToObjCmd(
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"yieldto called in deleted namespace", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "YIELDTO_IN_DELETED",
-		(void *)NULL);
+		(char *)NULL);
         return TCL_ERROR;
     }
 
@@ -9810,7 +9810,7 @@ TclNRCoroutineActivateCallback(
             Tcl_SetObjResult(interp, Tcl_NewStringObj(
                     "cannot yield: C stack busy", TCL_INDEX_NONE));
             Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "CANT_YIELD",
-                    (void *)NULL);
+                    (char *)NULL);
             return TCL_ERROR;
         }
 
@@ -9899,7 +9899,7 @@ CoroTypeObjCmd(
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "can only get coroutine type of a coroutine", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COROUTINE",
-                TclGetString(objv[1]), (void *)NULL);
+                TclGetString(objv[1]), (char *)NULL);
         return TCL_ERROR;
     }
 
@@ -9929,7 +9929,7 @@ CoroTypeObjCmd(
     default:
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "unknown coroutine type", TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "BAD_TYPE", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "BAD_TYPE", (char *)NULL);
         return TCL_ERROR;
     }
 }
@@ -9959,7 +9959,7 @@ GetCoroutineFromObj(
     if ((!cmdPtr) || (cmdPtr->nreProc != TclNRInterpCoroutine)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COROUTINE",
-                TclGetString(objPtr), (void *)NULL);
+                TclGetString(objPtr), (char *)NULL);
         return NULL;
     }
     return (CoroutineData *)cmdPtr->objClientData;
@@ -9992,7 +9992,7 @@ TclNRCoroInjectObjCmd(
     if (!COR_IS_SUSPENDED(corPtr)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "can only inject a command into a suspended coroutine", TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", (char *)NULL);
         return TCL_ERROR;
     }
 
@@ -10038,7 +10038,7 @@ TclNRCoroProbeObjCmd(
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "can only inject a probe command into a suspended coroutine",
                 TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", (char *)NULL);
         return TCL_ERROR;
     }
 
@@ -10229,7 +10229,7 @@ NRInjectObjCmd(
     if (!COR_IS_SUSPENDED(corPtr)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "can only inject a command into a suspended coroutine", TCL_INDEX_NONE));
-        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", (char *)NULL);
         return TCL_ERROR;
     }
 
@@ -10259,7 +10259,7 @@ TclNRInterpCoroutine(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "coroutine \"%s\" is already running",
                 TclGetString(objv[0])));
-	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "BUSY", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "BUSY", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -10283,7 +10283,7 @@ TclNRInterpCoroutine(
             Tcl_SetObjResult(interp,
                     Tcl_NewStringObj("wrong coro nargs; how did we get here? "
                     "not implemented!", TCL_INDEX_NONE));
-            Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", (void *)NULL);
+            Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", (char *)NULL);
             return TCL_ERROR;
         }
         /* fallthrough */
@@ -10337,14 +10337,14 @@ TclNRCoroutineObjCmd(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "can't create procedure \"%s\": unknown namespace",
                 procName));
-        Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "NAMESPACE", (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "NAMESPACE", (char *)NULL);
 	return TCL_ERROR;
     }
     if (simpleName == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                 "can't create procedure \"%s\": bad procedure name",
                 procName));
-        Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", procName, (void *)NULL);
+        Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMMAND", procName, (char *)NULL);
 	return TCL_ERROR;
     }