diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-12 13:12:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-12 13:12:41 (GMT) |
| commit | 356e08632c75c5e2a765e20dcca4ad0cc101ef63 (patch) | |
| tree | beb60cd6d549db3e4f4c95c1eae59aec4e278928 /unix | |
| parent | d6848c8f365edd4e7c703eeaf96b281e38fd8850 (diff) | |
| parent | b677876dcba5e36de46ff3f5d42473f716731806 (diff) | |
| download | tcl-356e08632c75c5e2a765e20dcca4ad0cc101ef63.zip tcl-356e08632c75c5e2a765e20dcca4ad0cc101ef63.tar.gz tcl-356e08632c75c5e2a765e20dcca4ad0cc101ef63.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/dltest/pkga.c | 2 | ||||
| -rw-r--r-- | unix/dltest/pkgt.c | 4 | ||||
| -rw-r--r-- | unix/dltest/pkgua.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c index be0a492..0b23215 100644 --- a/unix/dltest/pkga.c +++ b/unix/dltest/pkga.c @@ -50,6 +50,8 @@ Pkga_EqObjCmd( str1 = Tcl_GetStringFromObj(objv[1], &len1); str2 = Tcl_GetStringFromObj(objv[2], &len2); + len1 = Tcl_NumUtfChars(str1, len1); + len2 = Tcl_NumUtfChars(str2, len2); if (len1 == len2) { result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0); } else { diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c index 1f326f5..158bd9e 100644 --- a/unix/dltest/pkgt.c +++ b/unix/dltest/pkgt.c @@ -70,8 +70,10 @@ Pkgt_EqObjCmd2( str1 = Tcl_GetStringFromObj(objv[1], &len1); str2 = Tcl_GetStringFromObj(objv[2], &len2); + len1 = Tcl_NumUtfChars(str1, len1); + len2 = Tcl_NumUtfChars(str2, len2); if (len1 == len2) { - result = (Tcl_UtfNcmp(str1, str2, (size_t) len1) == 0); + result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0); } else { result = 0; } diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c index 92d3cc9..ba25d91 100644 --- a/unix/dltest/pkgua.c +++ b/unix/dltest/pkgua.c @@ -137,8 +137,10 @@ PkguaEqObjCmd( str1 = Tcl_GetStringFromObj(objv[1], &len1); str2 = Tcl_GetStringFromObj(objv[2], &len2); + len1 = Tcl_NumUtfChars(str1, len1); + len2 = Tcl_NumUtfChars(str2, len2); if (len1 == len2) { - result = (Tcl_UtfNcmp(str1, str2, (size_t) len1) == 0); + result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0); } else { result = 0; } |