Merge 8.7

1 files changed, 24 insertions, 24 deletions

diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index aad29fa..3b7230a 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -172,7 +172,7 @@ TclNamespaceEnsembleCmd(
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "tried to manipulate ensemble of deleted namespace",
 		    -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -291,7 +291,7 @@ TclNamespaceEnsembleCmd(
 				"ensemble subcommand implementations "
 				"must be non-empty lists", -1));
 			Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
-				"EMPTY_TARGET", (void *)NULL);
+				"EMPTY_TARGET", (char *)NULL);
 			Tcl_DictObjDone(&search);
 			if (patchedDict) {
 			    Tcl_DecrRefCount(patchedDict);
@@ -307,7 +307,7 @@ TclNamespaceEnsembleCmd(
 			Tcl_Obj *newCmd = NewNsObj((Tcl_Namespace *) nsPtr);
 
 			if (nsPtr->parentPtr) {
-			    Tcl_AppendStringsToObj(newCmd, "::", (void *)NULL);
+			    Tcl_AppendStringsToObj(newCmd, "::", (char *)NULL);
 			}
 			Tcl_AppendObjToObj(newCmd, listv[0]);
 			Tcl_ListObjReplace(NULL, newList, 0, 1, 1, &newCmd);
@@ -579,7 +579,7 @@ TclNamespaceEnsembleCmd(
 				    "ensemble subcommand implementations "
 				    "must be non-empty lists", -1));
 			    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
-				    "EMPTY_TARGET", (void *)NULL);
+				    "EMPTY_TARGET", (char *)NULL);
 			    Tcl_DictObjDone(&search);
 			    if (patchedDict) {
 				Tcl_DecrRefCount(patchedDict);
@@ -600,7 +600,7 @@ TclNamespaceEnsembleCmd(
 			    Tcl_Obj *newCmd = NewNsObj((Tcl_Namespace*)nsPtr);
 
 			    if (nsPtr->parentPtr) {
-				Tcl_AppendStringsToObj(newCmd, "::", (void *)NULL);
+				Tcl_AppendStringsToObj(newCmd, "::", (char *)NULL);
 			    }
 			    Tcl_AppendObjToObj(newCmd, listv[0]);
 			    Tcl_ListObjReplace(NULL, newList, 0, 1, 1,
@@ -627,7 +627,7 @@ TclNamespaceEnsembleCmd(
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "option -namespace is read-only", -1));
 		    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "READ_ONLY",
-			    (void *)NULL);
+			    (char *)NULL);
 		    goto freeMapAndError;
 		case CONF_PREFIX:
 		    if (Tcl_GetBooleanFromObj(interp, objv[1],
@@ -799,7 +799,7 @@ Tcl_SetEnsembleSubcommandList(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"command is not an ensemble", -1));
-	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	return TCL_ERROR;
     }
     if (subcmdList != NULL) {
@@ -875,7 +875,7 @@ Tcl_SetEnsembleParameterList(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"command is not an ensemble", -1));
-	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	return TCL_ERROR;
     }
     if (paramList == NULL) {
@@ -951,7 +951,7 @@ Tcl_SetEnsembleMappingDict(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"command is not an ensemble", -1));
-	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	return TCL_ERROR;
     }
     if (mapDict != NULL) {
@@ -979,7 +979,7 @@ Tcl_SetEnsembleMappingDict(
 			"ensemble target is not a fully-qualified command",
 			-1));
 		Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
-			"UNQUALIFIED_TARGET", (void *)NULL);
+			"UNQUALIFIED_TARGET", (char *)NULL);
 		Tcl_DictObjDone(&search);
 		return TCL_ERROR;
 	    }
@@ -1051,7 +1051,7 @@ Tcl_SetEnsembleUnknownHandler(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"command is not an ensemble", -1));
-	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	return TCL_ERROR;
     }
     if (unknownList != NULL) {
@@ -1117,7 +1117,7 @@ Tcl_SetEnsembleFlags(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"command is not an ensemble", -1));
-	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -1194,7 +1194,7 @@ Tcl_GetEnsembleSubcommandList(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "command is not an ensemble", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1236,7 +1236,7 @@ Tcl_GetEnsembleParameterList(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "command is not an ensemble", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1278,7 +1278,7 @@ Tcl_GetEnsembleMappingDict(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "command is not an ensemble", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1319,7 +1319,7 @@ Tcl_GetEnsembleUnknownHandler(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "command is not an ensemble", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1360,7 +1360,7 @@ Tcl_GetEnsembleFlags(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "command is not an ensemble", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1401,7 +1401,7 @@ Tcl_GetEnsembleNamespace(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "command is not an ensemble", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1462,7 +1462,7 @@ Tcl_FindEnsemble(
 			"\"%s\" is not an ensemble command",
 			TclGetString(cmdNameObj)));
 		Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENSEMBLE",
-			TclGetString(cmdNameObj), (void *)NULL);
+			TclGetString(cmdNameObj), (char *)NULL);
 	    }
 	    return NULL;
 	}
@@ -1754,7 +1754,7 @@ NsEnsembleImplementationCmdNR(
 	if (!Tcl_InterpDeleted(interp)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "ensemble activated for deleted namespace", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1966,7 +1966,7 @@ NsEnsembleImplementationCmdNR(
 
     Tcl_ResetResult(interp);
     Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "SUBCOMMAND",
-	    TclGetString(subObj), (void *)NULL);
+	    TclGetString(subObj), (char *)NULL);
     if (ensemblePtr->subcommandTable.numEntries == 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"unknown subcommand \"%s\": namespace %s does not"
@@ -2326,7 +2326,7 @@ EnsembleUnknownCallback(
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "unknown subcommand handler deleted its ensemble", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "UNKNOWN_DELETED",
-		    (void *)NULL);
+		    (char *)NULL);
 	}
 	result = TCL_ERROR;
     }
@@ -2390,7 +2390,7 @@ EnsembleUnknownCallback(
 		    "ensemble unknown subcommand handler: ");
 	    Tcl_AppendObjToErrorInfo(interp, unknownCmd);
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "UNKNOWN_RESULT",
-		    (void *)NULL);
+		    (char *)NULL);
 	} else {
 	    Tcl_AddErrorInfo(interp,
 		    "\n    (ensemble unknown subcommand handler)");
@@ -2724,7 +2724,7 @@ BuildEnsembleConfig(
 			Tcl_AppendStringsToObj(cmdObj,
 				ensemblePtr->nsPtr->fullName,
 				(ensemblePtr->nsPtr->parentPtr ? "::" : ""),
-				nsCmdName, (void *)NULL);
+				nsCmdName, (char *)NULL);
 			cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
 			Tcl_SetHashValue(hPtr, cmdPrefixObj);
 			Tcl_IncrRefCount(cmdPrefixObj);