diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-17 16:47:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-17 16:47:03 (GMT) |
| commit | 21c68a2e1d7a0c5a9b78091d5dffd972a01dede8 (patch) | |
| tree | 916acaa7021784555aa23ea5ea44108eca975241 /generic | |
| parent | dd7138fa37d6858fa92d501c2e418384b6cbc6cf (diff) | |
| download | tcl-21c68a2e1d7a0c5a9b78091d5dffd972a01dede8.zip tcl-21c68a2e1d7a0c5a9b78091d5dffd972a01dede8.tar.gz tcl-21c68a2e1d7a0c5a9b78091d5dffd972a01dede8.tar.bz2 | |
Use TCL_ENCODING_NOCOMPLAIN flag in stead of TCL_ENCODING_STOPONERROR when possible, since TCL_ENCODING_STOPONERROR becomes meaningless in 9.0
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCmdAH.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index 60a2c42..c87bc46 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -600,7 +600,7 @@ encConvFromOK: } result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length, flags, &ds); - if ((flags & TCL_ENCODING_STOPONERROR) && (result != (size_t)-1)) { + if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != (size_t)-1)) { char buf[TCL_INTEGER_SPACE]; sprintf(buf, "%" TCL_Z_MODIFIER "u", result); Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected byte sequence starting at index %" @@ -696,7 +696,7 @@ encConvToOK: stringPtr = TclGetStringFromObj(data, &length); result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length, flags, &ds); - if ((flags & TCL_ENCODING_STOPONERROR) && (result != (size_t)-1)) { + if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != (size_t)-1)) { size_t pos = Tcl_NumUtfChars(stringPtr, result); int ucs4; char buf[TCL_INTEGER_SPACE]; |