diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-20 21:33:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-20 21:33:39 (GMT) |
| commit | f567767f65983e81994ba6b29de78cede613109b (patch) | |
| tree | 66ccff0d39886b8e9a2676ad080c023888da56cb /generic/tclEncoding.c | |
| parent | 48db2fee44128a4882b9868bfa3f52f6788fd2fb (diff) | |
| parent | a0b26511ec3f53545e575b609822ad525be69118 (diff) | |
| download | tcl-f567767f65983e81994ba6b29de78cede613109b.zip tcl-f567767f65983e81994ba6b29de78cede613109b.tar.gz tcl-f567767f65983e81994ba6b29de78cede613109b.tar.bz2 | |
Merge 8.7 Fix Tcl_UtfToExternalDString/Tcl_ExternalToUtfDString to use the right flag value (TCL_ENCODING_NOCOMPLAIN) as default. Change Tcl_UtfToExternalDString/Tcl_ExternalToUtfDString to be a macro
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 162f25e..9bce621 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -1068,6 +1068,7 @@ Tcl_CreateEncoding( *------------------------------------------------------------------------- */ +#undef Tcl_ExternalToUtfDString char * Tcl_ExternalToUtfDString( Tcl_Encoding encoding, /* The encoding for the source string, or NULL @@ -1078,7 +1079,7 @@ Tcl_ExternalToUtfDString( Tcl_DString *dstPtr) /* Uninitialized or free DString in which the * converted string is stored. */ { - Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, 0, dstPtr); + Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr); return Tcl_DStringValue(dstPtr); } @@ -1304,7 +1305,7 @@ Tcl_ExternalToUtf( * *------------------------------------------------------------------------- */ - +#undef Tcl_UtfToExternalDString char * Tcl_UtfToExternalDString( Tcl_Encoding encoding, /* The encoding for the converted string, or @@ -1315,7 +1316,7 @@ Tcl_UtfToExternalDString( Tcl_DString *dstPtr) /* Uninitialized or free DString in which the * converted string is stored. */ { - Tcl_UtfToExternalDStringEx(encoding, src, srcLen, 0, dstPtr); + Tcl_UtfToExternalDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr); return Tcl_DStringValue(dstPtr); } |