diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-04-16 18:08:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-04-16 18:08:08 (GMT) |
| commit | 0ceb73f34c1bca398ed4c6e9ceaf1e00eb23006d (patch) | |
| tree | bde1e03358705869399987001a49b9cc69b71a18 | |
| parent | 898f3544928665515cb9a05c7063b4828a8376af (diff) | |
| parent | 61722ce13d58865dabec38cc1ec9f52152f191af (diff) | |
| download | tcl-0ceb73f34c1bca398ed4c6e9ceaf1e00eb23006d.zip tcl-0ceb73f34c1bca398ed4c6e9ceaf1e00eb23006d.tar.gz tcl-0ceb73f34c1bca398ed4c6e9ceaf1e00eb23006d.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclEncoding.c | 6 | ||||
| -rw-r--r-- | tests/ioCmd.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 9469703..9b1894e 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -610,7 +610,7 @@ TclInitEncodingSubsystem(void) type.nullSize = 1; type.clientData = INT2PTR(ENCODING_UTF); Tcl_CreateEncoding(&type); - type.clientData = INT2PTR(0); + type.clientData = NULL; type.encodingName = "cesu-8"; Tcl_CreateEncoding(&type); @@ -622,7 +622,7 @@ TclInitEncodingSubsystem(void) type.clientData = INT2PTR(TCL_ENCODING_LE); Tcl_CreateEncoding(&type); type.encodingName = "ucs-2be"; - type.clientData = INT2PTR(0); + type.clientData = NULL; Tcl_CreateEncoding(&type); type.encodingName = "ucs-2"; type.clientData = INT2PTR(leFlags); @@ -636,7 +636,7 @@ TclInitEncodingSubsystem(void) type.clientData = INT2PTR(TCL_ENCODING_LE); Tcl_CreateEncoding(&type); type.encodingName = "utf-32be"; - type.clientData = INT2PTR(0); + type.clientData = NULL; Tcl_CreateEncoding(&type); type.encodingName = "utf-32"; type.clientData = INT2PTR(leFlags); diff --git a/tests/ioCmd.test b/tests/ioCmd.test index 5d731b9..1c06ba3 100644 --- a/tests/ioCmd.test +++ b/tests/ioCmd.test @@ -2369,7 +2369,7 @@ test iocmd.tf-23.1 {chan read, regular data return} -match glob -body { rename foo {} set res } -constraints {testchannel thread} -result {{read rc* 4096} {read rc* 4096} snarfsnarf} -test iocmd.tf-23.2 {chan read, bad data return, to much} -match glob -body { +test iocmd.tf-23.2 {chan read, bad data return, too much} -match glob -body { set res {} proc foo {args} { oninit; onfinal; track |