diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2023-03-01 13:41:44 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2023-03-01 13:41:44 (GMT) |
| commit | cc5dd09db3f63c8ad16fddd0540d5deb6924cfe6 (patch) | |
| tree | 530972315623eb11284a65083df486311e2ab5ee /generic | |
| parent | 30a9b333ba194339f5e8f68575626df0701b2a50 (diff) | |
| parent | 261c174d97c0b75e9c557c4c05514db34e52e58b (diff) | |
| download | tcl-cc5dd09db3f63c8ad16fddd0540d5deb6924cfe6.zip tcl-cc5dd09db3f63c8ad16fddd0540d5deb6924cfe6.tar.gz tcl-cc5dd09db3f63c8ad16fddd0540d5deb6924cfe6.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclZlib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c index a0e79ac..6278628 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -444,8 +444,8 @@ GenerateHeader( goto error; } else if (value != NULL) { Tcl_EncodingState state; - valueStr = Tcl_GetStringFromObj(value, &len); - result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, len, + valueStr = Tcl_GetStringFromObj(value, &length); + result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, length, TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state, headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len, NULL); @@ -476,8 +476,8 @@ GenerateHeader( goto error; } else if (value != NULL) { Tcl_EncodingState state; - valueStr = Tcl_GetStringFromObj(value, &len); - result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, len, + valueStr = Tcl_GetStringFromObj(value, &length); + result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, length, TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state, headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len, NULL); @@ -570,7 +570,7 @@ ExtractHeader( } } - Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1, + (void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1, &tmp); SetValue(dictObj, "comment", Tcl_DStringToObj(&tmp)); } @@ -587,7 +587,7 @@ ExtractHeader( } } - Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1, + (void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1, &tmp); SetValue(dictObj, "filename", Tcl_DStringToObj(&tmp)); } |