Skip to content

Commit

Permalink
Merge 8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Oct 27, 2023
2 parents 9f045a8 + 14ab5cc commit 81ca293
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
28 changes: 14 additions & 14 deletions generic/tclTest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1192,10 +1192,10 @@ TestcmdinfoObjCmd(
}
if (info.deleteProc == CmdDelProc1) {
Tcl_AppendResult(interp, " CmdDelProc1", " ",
(char *) info.deleteData, NULL);
(char *) info.deleteData, (void *)NULL);
} else if (info.deleteProc == CmdDelProc2) {
Tcl_AppendResult(interp, " CmdDelProc2", " ",
(char *) info.deleteData, NULL);
(char *) info.deleteData, (void *)NULL);
} else {
Tcl_AppendResult(interp, " unknown", (void *)NULL);
}
Expand Down Expand Up @@ -1350,7 +1350,7 @@ TestcmdtokenCmd(
refPtr->nextPtr = firstCommandTokenRef;
firstCommandTokenRef = refPtr;
snprintf(buf, sizeof(buf), "%d", refPtr->id);
Tcl_AppendResult(interp, buf, NULL);
Tcl_AppendResult(interp, buf, (void *)NULL);
} else {
if (sscanf(argv[2], "%d", &id) != 1) {
Tcl_AppendResult(interp, "bad command token \"", argv[2],
Expand Down Expand Up @@ -1645,7 +1645,7 @@ CreatedCommandProc(
&info);
if (!found) {
Tcl_AppendResult(interp, "CreatedCommandProc could not get command info for test_ns_basic::createdcommand",
NULL);
(void *)NULL);
return TCL_ERROR;
}
Tcl_AppendResult(interp, "CreatedCommandProc in ",
Expand Down Expand Up @@ -2871,7 +2871,7 @@ TestexprlongCmd(
" expression\"", (void *)NULL);
return TCL_ERROR;
}
Tcl_AppendResult(interp, "This is a result", NULL);
Tcl_AppendResult(interp, "This is a result", (void *)NULL);
result = Tcl_ExprLong(interp, argv[1], &exprResult);
if (result != TCL_OK) {
return result;
Expand Down Expand Up @@ -5080,23 +5080,23 @@ TestseterrorcodeCmd(
}
switch (argc) {
case 1:
Tcl_SetErrorCode(interp, "NONE", NULL);
Tcl_SetErrorCode(interp, "NONE", (void *)NULL);
break;
case 2:
Tcl_SetErrorCode(interp, argv[1], NULL);
Tcl_SetErrorCode(interp, argv[1], (void *)NULL);
break;
case 3:
Tcl_SetErrorCode(interp, argv[1], argv[2], NULL);
Tcl_SetErrorCode(interp, argv[1], argv[2], (void *)NULL);
break;
case 4:
Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], NULL);
Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], (void *)NULL);
break;
case 5:
Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4], NULL);
Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4], (void *)NULL);
break;
case 6:
Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4],
argv[5], NULL);
argv[5], (void *)NULL);
}
return TCL_ERROR;
}
Expand Down Expand Up @@ -6392,7 +6392,7 @@ TestChannelCmd(
}

Tcl_AppendResult(interp,
(statePtr->flags & INPUT_SAW_CR) ? "1" : "0", NULL);
(statePtr->flags & INPUT_SAW_CR) ? "1" : "0", (void *)NULL);
return TCL_OK;
}

Expand Down Expand Up @@ -6482,7 +6482,7 @@ TestChannelCmd(
}
if (strcmp(argv[3], "-command") != 0) {
Tcl_AppendResult(interp, "bad argument \"", argv[3],
"\": should be \"-command\"", NULL);
"\": should be \"-command\"", (void *)NULL);
return TCL_ERROR;
}

Expand Down Expand Up @@ -8166,7 +8166,7 @@ TestconcatobjCmd(
Tcl_DecrRefCount(tmpPtr);
break;
default:
Tcl_AppendResult(interp, "(more than one refCount added!)", NULL);
Tcl_AppendResult(interp, "(more than one refCount added!)", (void *)NULL);
Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
}
tmpPtr = Tcl_DuplicateObj(list1Ptr);
Expand Down
10 changes: 5 additions & 5 deletions generic/tclTestObj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ TestbooleanobjCmd(
} else {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"bad option \"", Tcl_GetString(objv[1]),
"\": must be set, get, or not", NULL);
"\": must be set, get, or not", (void *)NULL);
return TCL_ERROR;
}
return TCL_OK;
Expand Down Expand Up @@ -535,7 +535,7 @@ TestdoubleobjCmd(
} else {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"bad option \"", Tcl_GetString(objv[1]),
"\": must be set, get, mult10, or div10", NULL);
"\": must be set, get, mult10, or div10", (void *)NULL);
return TCL_ERROR;
}
return TCL_OK;
Expand Down Expand Up @@ -824,7 +824,7 @@ TestintobjCmd(
} else {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"bad option \"", Tcl_GetString(objv[1]),
"\": must be set, get, get2, mult10, or div10", NULL);
"\": must be set, get, get2, mult10, or div10", (void *)NULL);
return TCL_ERROR;
}
return TCL_OK;
Expand Down Expand Up @@ -1234,7 +1234,7 @@ TestobjCmd(
}
if ((targetType = Tcl_GetObjType(Tcl_GetString(objv[3]))) == NULL) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"no type ", Tcl_GetString(objv[3]), " found", NULL);
"no type ", Tcl_GetString(objv[3]), " found", (void *)NULL);
return TCL_ERROR;
}
if (Tcl_ConvertToType(interp, varPtr[varIndex], targetType)
Expand Down Expand Up @@ -1391,7 +1391,7 @@ TeststringobjCmd(
Tcl_AppendStringsToObj(varPtr[varIndex], strings[0], strings[1],
strings[2], strings[3], strings[4], strings[5],
strings[6], strings[7], strings[8], strings[9],
strings[10], strings[11]);
strings[10], strings[11], (void *)NULL);
Tcl_SetObjResult(interp, varPtr[varIndex]);
break;
case 2: /* get */
Expand Down
6 changes: 3 additions & 3 deletions generic/tclTestProcBodyObj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ ProcBodyTestProcObjCmd(

if (cmdPtr->objClientData != TclIsProc(cmdPtr)) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"command \"", fullName, "\" is not a Tcl procedure", NULL);
"command \"", fullName, "\" is not a Tcl procedure", (void *)NULL);
return TCL_ERROR;
}

Expand All @@ -274,7 +274,7 @@ ProcBodyTestProcObjCmd(
procPtr = (Proc *) cmdPtr->objClientData;
if (procPtr == NULL) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "procedure \"",
fullName, "\" does not have a Proc struct!", NULL);
fullName, "\" does not have a Proc struct!", (void *)NULL);
return TCL_ERROR;
}

Expand All @@ -286,7 +286,7 @@ ProcBodyTestProcObjCmd(
if (bodyObjPtr == NULL) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"failed to create a procbody object for procedure \"",
fullName, "\"", NULL);
fullName, "\"", (void *)NULL);
return TCL_ERROR;
}
Tcl_IncrRefCount(bodyObjPtr);
Expand Down
2 changes: 1 addition & 1 deletion generic/tclThreadTest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ ThreadSend(

if (resultPtr->code != TCL_OK) {
if (resultPtr->errorCode) {
Tcl_SetErrorCode(interp, resultPtr->errorCode, NULL);
Tcl_SetErrorCode(interp, resultPtr->errorCode, (void *)NULL);
Tcl_Free(resultPtr->errorCode);
}
if (resultPtr->errorInfo) {
Expand Down
18 changes: 9 additions & 9 deletions win/tclWinDde.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ ExecuteRemoteObject(
Tcl_SetObjResult(riPtr->interp, Tcl_NewStringObj("permission denied: "
"a handler procedure must be defined for use in a safe "
"interp", TCL_INDEX_NONE));
Tcl_SetErrorCode(riPtr->interp, "TCL", "DDE", "SECURITY_CHECK", NULL);
Tcl_SetErrorCode(riPtr->interp, "TCL", "DDE", "SECURITY_CHECK", (void *)NULL);
result = TCL_ERROR;
}

Expand Down Expand Up @@ -1046,7 +1046,7 @@ MakeDdeConnection(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"no registered server named \"%s\"", Tcl_DStringValue(&dString)));
Tcl_DStringFree(&dString);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", (void *)NULL);
}
return TCL_ERROR;
}
Expand Down Expand Up @@ -1277,7 +1277,7 @@ SetDdeError(
}

Tcl_SetObjResult(interp, Tcl_NewStringObj(errorMessage, TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "DDE", errorCode, NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", errorCode, (void *)NULL);
}

/*
Expand Down Expand Up @@ -1564,7 +1564,7 @@ DdeObjCmd(
Tcl_SetObjResult(interp,
Tcl_NewStringObj("cannot execute null data", TCL_INDEX_NONE));
Tcl_DStringFree(&dsBuf);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (void *)NULL);
result = TCL_ERROR;
break;
}
Expand Down Expand Up @@ -1614,7 +1614,7 @@ DdeObjCmd(
if (length == 0) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("cannot request value of null data", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (void *)NULL);
result = TCL_ERROR;
goto cleanup;
}
Expand Down Expand Up @@ -1680,7 +1680,7 @@ DdeObjCmd(
if (length == 0) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("cannot have a null item", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (void *)NULL);
result = TCL_ERROR;
goto cleanup;
}
Expand Down Expand Up @@ -1734,7 +1734,7 @@ DdeObjCmd(
if (serviceName == NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("invalid service name \"\"", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", (void *)NULL);
result = TCL_ERROR;
goto cleanup;
}
Expand Down Expand Up @@ -1783,7 +1783,7 @@ DdeObjCmd(
"permission denied: a handler procedure must be"
" defined for use in a safe interp", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "DDE", "SECURITY_CHECK",
NULL);
(void *)NULL);
result = TCL_ERROR;
}

Expand Down Expand Up @@ -1848,7 +1848,7 @@ DdeObjCmd(
invalidServerResponse:
Tcl_SetObjResult(interp,
Tcl_NewStringObj("invalid data returned from server", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "DDE", "BAD_RESPONSE", NULL);
Tcl_SetErrorCode(interp, "TCL", "DDE", "BAD_RESPONSE", (void *)NULL);
result = TCL_ERROR;
goto cleanup;
}
Expand Down
6 changes: 3 additions & 3 deletions win/tclWinReg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ DeleteKey(
if (*keyName == '\0') {
Tcl_SetObjResult(interp,
Tcl_NewStringObj("bad key: cannot delete root keys", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "WIN_REG", "DEL_ROOT_KEY", NULL);
Tcl_SetErrorCode(interp, "WIN_REG", "DEL_ROOT_KEY", (void *)NULL);
Tcl_Free(buffer);
return TCL_ERROR;
}
Expand Down Expand Up @@ -1143,7 +1143,7 @@ ParseKeyName(
if (!rootName) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad key \"%s\": must start with a valid root", name));
Tcl_SetErrorCode(interp, "WIN_REG", "NO_ROOT_KEY", NULL);
Tcl_SetErrorCode(interp, "WIN_REG", "NO_ROOT_KEY", (void *)NULL);
return TCL_ERROR;
}

Expand Down Expand Up @@ -1535,7 +1535,7 @@ AppendSystemError(
}

snprintf(id, sizeof(id), "%ld", error);
Tcl_SetErrorCode(interp, "WINDOWS", id, msg, NULL);
Tcl_SetErrorCode(interp, "WINDOWS", id, msg, (void *)NULL);
Tcl_AppendToObj(resultPtr, msg, length);
Tcl_SetObjResult(interp, resultPtr);

Expand Down

0 comments on commit 81ca293

Please sign in to comment.