Skip to content

Commit

Permalink
Merge 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Oct 25, 2024
2 parents 2c6c84f + e583bbb commit 2fdbc57
Show file tree
Hide file tree
Showing 19 changed files with 245 additions and 245 deletions.
2 changes: 1 addition & 1 deletion doc/clock.n
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ have 59 or 61 seconds.
.TP
\fInow\fR
Instead of \fItimeVal\fR a non-integer value \fBnow\fR can be used as
replacement for today, which is simply interpolated to the runt-time as value
replacement for today, which is simply interpolated to the run-time as value
of \fBclock seconds\fR. For example:
.sp
\fBclock format now -f %a; # current day of the week\fR
Expand Down
6 changes: 3 additions & 3 deletions generic/tclArithSeries.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ TclNewArithSeriesObj(
if (len > TCL_SIZE_MAX) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"max length of a Tcl list exceeded", TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
return NULL;
}

Expand Down Expand Up @@ -957,7 +957,7 @@ TclArithSeriesGetElements(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"max length of a Tcl list exceeded",
TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL);
}
return TCL_ERROR;
}
Expand All @@ -982,7 +982,7 @@ TclArithSeriesGetElements(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"value is not an arithseries", TCL_AUTO_LENGTH));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "UNKNOWN", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "UNKNOWN", (char *)NULL);
}
return TCL_ERROR;
}
Expand Down
18 changes: 9 additions & 9 deletions generic/tclBinary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ TclGetBytesFromObj(
if (interp) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"byte sequence length exceeds INT_MAX", -1));
Tcl_SetErrorCode(interp, "TCL", "API", "OUTDATED", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "API", "OUTDATED", (char *)NULL);
}
return NULL;
} else {
Expand Down Expand Up @@ -522,7 +522,7 @@ MakeByteArray(
"expected byte sequence but character %"
TCL_Z_MODIFIER "u was '%1s' (U+%06X)",
dst - byteArrayPtr->bytes, src, ch));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "BYTES", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "VALUE", "BYTES", (char *)NULL);
}
Tcl_Free(byteArrayPtr);
*byteArrayPtrPtr = NULL;
Expand Down Expand Up @@ -2568,7 +2568,7 @@ BinaryDecodeHex(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid hexadecimal digit \"%c\" (U+%06X) at position %"
TCL_Z_MODIFIER "u", ucs4, ucs4, data - datastart - 1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (char *)NULL);
return TCL_ERROR;
}

Expand Down Expand Up @@ -2637,7 +2637,7 @@ BinaryEncode64(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
"LINE_LENGTH", (void *)NULL);
"LINE_LENGTH", (char *)NULL);
return TCL_ERROR;
}
break;
Expand Down Expand Up @@ -2764,7 +2764,7 @@ BinaryEncodeUu(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
"LINE_LENGTH", (void *)NULL);
"LINE_LENGTH", (char *)NULL);
return TCL_ERROR;
}
lineLength = ((lineLength - 1) & -4) + 1; /* 5, 9, 13 ... */
Expand Down Expand Up @@ -2793,7 +2793,7 @@ BinaryEncodeUu(
"invalid wrapchar; will defeat decoding",
-1));
Tcl_SetErrorCode(interp, "TCL", "BINARY",
"ENCODE", "WRAPCHAR", (void *)NULL);
"ENCODE", "WRAPCHAR", (char *)NULL);
return TCL_ERROR;
}
}
Expand Down Expand Up @@ -3018,7 +3018,7 @@ BinaryDecodeUu(

shortUu:
Tcl_SetObjResult(interp, Tcl_ObjPrintf("short uuencode data"));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "SHORT", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "SHORT", (char *)NULL);
TclDecrRefCount(resultObj);
return TCL_ERROR;

Expand All @@ -3031,7 +3031,7 @@ BinaryDecodeUu(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid uuencode character \"%c\" (U+%06X) at position %"
TCL_Z_MODIFIER "u", ucs4, ucs4, data - datastart - 1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (char *)NULL);
TclDecrRefCount(resultObj);
return TCL_ERROR;
}
Expand Down Expand Up @@ -3207,7 +3207,7 @@ BinaryDecode64(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"invalid base64 character \"%c\" (U+%06X) at position %"
TCL_Z_MODIFIER "u", ucs4, ucs4, data - datastart - 1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "BINARY", "DECODE", "INVALID", (char *)NULL);
TclDecrRefCount(resultObj);
return TCL_ERROR;
}
Expand Down
2 changes: 1 addition & 1 deletion generic/tclCompile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2194,7 +2194,7 @@ TclCompileScript(
"Script length %" TCL_SIZE_MODIFIER
"d exceeds max permitted length %d.",
numBytes, INT_MAX-1));
Tcl_SetErrorCode(interp, "TCL", "LIMIT", "SCRIPTLENGTH", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "LIMIT", "SCRIPTLENGTH", (char *)NULL);
TclCompileSyntaxError(interp, envPtr);
return;
}
Expand Down
20 changes: 10 additions & 10 deletions generic/tclFileName.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ Tcl_GlobObjCmd(
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-directory\"", -1));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (char *)NULL);
return TCL_ERROR;
}
if (dir != PATH_NONE) {
Expand All @@ -1182,7 +1182,7 @@ Tcl_GlobObjCmd(
: "\"-directory\" cannot be used with \"-path\"",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
"BADOPTIONCOMBINATION", (void *)NULL);
"BADOPTIONCOMBINATION", (char *)NULL);
return TCL_ERROR;
}
dir = PATH_DIR;
Expand All @@ -1200,7 +1200,7 @@ Tcl_GlobObjCmd(
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-path\"", -1));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (char *)NULL);
return TCL_ERROR;
}
if (dir != PATH_NONE) {
Expand All @@ -1210,7 +1210,7 @@ Tcl_GlobObjCmd(
: "\"-path\" cannot be used with \"-dictionary\"",
-1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
"BADOPTIONCOMBINATION", (void *)NULL);
"BADOPTIONCOMBINATION", (char *)NULL);
return TCL_ERROR;
}
dir = PATH_GENERAL;
Expand All @@ -1221,7 +1221,7 @@ Tcl_GlobObjCmd(
if (i == (objc-1)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"missing argument to \"-types\"", -1));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", (char *)NULL);
return TCL_ERROR;
}
typePtr = objv[i+1];
Expand All @@ -1242,7 +1242,7 @@ Tcl_GlobObjCmd(
"\"-tails\" must be used with either "
"\"-directory\" or \"-path\"", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
"BADOPTIONCOMBINATION", (void *)NULL);
"BADOPTIONCOMBINATION", (char *)NULL);
return TCL_ERROR;
}

Expand Down Expand Up @@ -1456,7 +1456,7 @@ Tcl_GlobObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad argument to \"-types\": %s",
TclGetString(look)));
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (char *)NULL);
result = TCL_ERROR;
join = 0;
goto endOfGlob;
Expand All @@ -1466,7 +1466,7 @@ Tcl_GlobObjCmd(
"only one MacOS type or creator argument"
" to \"-types\" allowed", -1));
result = TCL_ERROR;
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (void *)NULL);
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", (char *)NULL);
join = 0;
goto endOfGlob;
}
Expand Down Expand Up @@ -2037,14 +2037,14 @@ DoGlob(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched open-brace in file name", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
(void *)NULL);
(char *)NULL);
return TCL_ERROR;

} else if (*p == '}') {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"unmatched close-brace in file name", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
(void *)NULL);
(char *)NULL);
return TCL_ERROR;
}
}
Expand Down
2 changes: 1 addition & 1 deletion generic/tclIOGT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ ExecuteCallback(
}
nonBytes:
Tcl_AppendResult(interp, "chan transform callback received non-bytes",
(void *)NULL);
(char *)NULL);
Tcl_Release(eval);
return TCL_ERROR;

Expand Down
Loading

0 comments on commit 2fdbc57

Please sign in to comment.