diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-11 20:56:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-11 20:56:32 (GMT) |
| commit | fd3fca18dbf1180ee000a49bcdc3abc98fb97920 (patch) | |
| tree | 944f23c4fa8252fea85c5eda4a8f9781d86580ad /generic/tclEncoding.c | |
| parent | 0bd8e4a634e88f8415e8904c7e5ed4c87a0243af (diff) | |
| parent | 8e7a963f7fb10cc556337a18a652fd0c78c51029 (diff) | |
| download | tcl-fd3fca18dbf1180ee000a49bcdc3abc98fb97920.zip tcl-fd3fca18dbf1180ee000a49bcdc3abc98fb97920.tar.gz tcl-fd3fca18dbf1180ee000a49bcdc3abc98fb97920.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 14efadb..222f11d 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -234,12 +234,12 @@ static int TableToUtfProc(ClientData clientData, const char *src, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); static size_t unilen(const char *src); -static int UnicodeToUtfProc(ClientData clientData, +static int UniCharToUtfProc(ClientData clientData, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); -static int UtfToUnicodeProc(ClientData clientData, +static int UtfToUniCharProc(ClientData clientData, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, @@ -596,8 +596,8 @@ TclInitEncodingSubsystem(void) Tcl_CreateEncoding(&type); type.encodingName = "unicode"; - type.toUtfProc = UnicodeToUtfProc; - type.fromUtfProc = UtfToUnicodeProc; + type.toUtfProc = UniCharToUtfProc; + type.fromUtfProc = UtfToUniCharProc; type.freeProc = NULL; type.nullSize = 2; type.clientData = NULL; @@ -2339,7 +2339,7 @@ UtfToUtfProc( /* *------------------------------------------------------------------------- * - * UnicodeToUtfProc -- + * UniCharToUtfProc -- * * Convert from Unicode to UTF-8. * @@ -2353,7 +2353,7 @@ UtfToUtfProc( */ static int -UnicodeToUtfProc( +UniCharToUtfProc( ClientData clientData, /* Not used. */ const char *src, /* Source string in Unicode. */ int srcLen, /* Source string length in bytes. */ @@ -2429,7 +2429,7 @@ UnicodeToUtfProc( /* *------------------------------------------------------------------------- * - * UtfToUnicodeProc -- + * UtfToUniCharProc -- * * Convert from UTF-8 to Unicode. * @@ -2443,7 +2443,7 @@ UnicodeToUtfProc( */ static int -UtfToUnicodeProc( +UtfToUniCharProc( ClientData clientData, /* TableEncodingData that specifies * encoding. */ const char *src, /* Source string in UTF-8. */ |