summaryrefslogtreecommitdiffstats
path: root/generic/tclIOCmd.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2024-08-06 11:12:47 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2024-08-06 11:12:47 (GMT)
commit6c41478f2cdcbefeae9c340e1ba2bc9d8d51d47d (patch)
tree10b477c4f96989d84a5453310c9715aaef2b3413 /generic/tclIOCmd.c
parent351ab9f3bf86ea2d971416a759964c836e91c1b9 (diff)
parente92ac699c1a4fc8683a61f855f5250c72d12b1c1 (diff)
downloadtcl-6c41478f2cdcbefeae9c340e1ba2bc9d8d51d47d.zip
tcl-6c41478f2cdcbefeae9c340e1ba2bc9d8d51d47d.tar.gz
tcl-6c41478f2cdcbefeae9c340e1ba2bc9d8d51d47d.tar.bz2
merge 8.6
Diffstat (limited to 'generic/tclIOCmd.c')
-rw-r--r--generic/tclIOCmd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 5127b99..0c8af09 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -450,7 +450,7 @@ Tcl_ReadObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected non-negative integer but got \"%s\"",
TclGetString(objv[i])));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", (char *)NULL);
return TCL_ERROR;
}
newline = 1;
@@ -1386,7 +1386,7 @@ AcceptCallbackProc(
Tcl_RegisterChannel(NULL, chan);
result = Tcl_VarEval(interp, script, " ", Tcl_GetChannelName(chan),
- " ", address, " ", portBuf, NULL);
+ " ", address, " ", portBuf, (char *)NULL);
if (result != TCL_OK) {
Tcl_BackgroundException(interp, result);
Tcl_UnregisterChannel(interp, chan);
@@ -2005,8 +2005,7 @@ TclInitChanCmd(
* Can assume that reference counts are all incremented.
*/
- Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj(extras[i], -1),
- Tcl_NewStringObj(extras[i+1], -1));
+ TclDictPutString(NULL, mapObj, extras[i], extras[i + 1]);
}
Tcl_SetEnsembleMappingDict(interp, ensemble, mapObj);
return ensemble;