diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-09-05 12:28:41 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-09-05 12:28:41 (GMT) |
| commit | 018892450cdacc7e4660a4cc138a51e1143a2b12 (patch) | |
| tree | bc8d5053c422ca180b237864f9522bb64c885cf9 /generic/tclBinary.c | |
| parent | d23fe52664cbef62956cc8ba4e689b9873992b0c (diff) | |
| parent | edb7af10d93df44cc25e9dce384c61669ce73dc8 (diff) | |
| download | tcl-tip_282.zip tcl-tip_282.tar.gz tcl-tip_282.tar.bz2 | |
merge trunktip_282
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 72f1498..a693894 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -536,7 +536,7 @@ SetByteArrayFromAny( const char *src, *srcEnd; unsigned char *dst; ByteArray *byteArrayPtr; - Tcl_UniChar ch; + Tcl_UniChar ch = 0; if (objPtr->typePtr == &properByteArrayType) { return TCL_OK; @@ -551,7 +551,7 @@ SetByteArrayFromAny( byteArrayPtr = ckalloc(BYTEARRAY_SIZE(length)); for (dst = byteArrayPtr->bytes; src < srcEnd; ) { - src += Tcl_UtfToUniChar(src, &ch); + src += TclUtfToUniChar(src, &ch); improper = improper || (ch > 255); *dst++ = UCHAR(ch); } @@ -1300,10 +1300,10 @@ BinaryFormatCmd( badField: { - Tcl_UniChar ch; + Tcl_UniChar ch = 0; char buf[TCL_UTF_MAX + 1]; - Tcl_UtfToUniChar(errorString, &ch); + TclUtfToUniChar(errorString, &ch); buf[Tcl_UniCharToUtf(ch, buf)] = '\0'; Tcl_SetObjResult(interp, Tcl_ObjPrintf( "bad field specifier \"%s\"", buf)); @@ -1670,10 +1670,10 @@ BinaryScanCmd( badField: { - Tcl_UniChar ch; + Tcl_UniChar ch = 0; char buf[TCL_UTF_MAX + 1]; - Tcl_UtfToUniChar(errorString, &ch); + TclUtfToUniChar(errorString, &ch); buf[Tcl_UniCharToUtf(ch, buf)] = '\0'; Tcl_SetObjResult(interp, Tcl_ObjPrintf( "bad field specifier \"%s\"", buf)); |