diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-11 20:02:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-11 20:02:40 (GMT) |
| commit | f8c365412ab16261db162c4018b225b1dd096aa8 (patch) | |
| tree | 02e91e1577770fb368b1db809c5f12096e38d614 /generic/tclEncoding.c | |
| parent | 9d94ed0d5461f1677bc5483a618768872457b7dc (diff) | |
| parent | 00268d4ae68741fdbf73a54412cd38648f9d7302 (diff) | |
| download | tcl-f8c365412ab16261db162c4018b225b1dd096aa8.zip tcl-f8c365412ab16261db162c4018b225b1dd096aa8.tar.gz tcl-f8c365412ab16261db162c4018b225b1dd096aa8.tar.bz2 | |
Merge 8.7
In test-cases, don't load Tcltest package if it isn't actually used.
Another round of size_t related improvements. Nothing functional. Also improve some comments.
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index caf8fa5..cd388f4 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2011,9 +2011,9 @@ LoadEscapeEncoding( + Tcl_DStringLength(&escapeData); dataPtr = Tcl_Alloc(size); dataPtr->initLen = strlen(init); - memcpy(dataPtr->init, init, (unsigned) dataPtr->initLen + 1); + memcpy(dataPtr->init, init, dataPtr->initLen + 1); dataPtr->finalLen = strlen(final); - memcpy(dataPtr->final, final, (unsigned) dataPtr->finalLen + 1); + memcpy(dataPtr->final, final, dataPtr->finalLen + 1); dataPtr->numSubTables = Tcl_DStringLength(&escapeData) / sizeof(EscapeSubTable); memcpy(dataPtr->subTables, Tcl_DStringValue(&escapeData), |