diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-24 21:07:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-24 21:07:52 (GMT) |
| commit | e9034f37542010a9dfeb054699ce1c9e74169f59 (patch) | |
| tree | 61f7a38b8e57c343568927a0cd8e6d3c8ab485db /generic/tclBinary.c | |
| parent | ea65a9b87515afd2e9c9738a219a02a437892ed7 (diff) | |
| parent | 1c5db697830a5c68632e9979b2a678e6c8606460 (diff) | |
| download | tcl-e9034f37542010a9dfeb054699ce1c9e74169f59.zip tcl-e9034f37542010a9dfeb054699ce1c9e74169f59.tar.gz tcl-e9034f37542010a9dfeb054699ce1c9e74169f59.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tclBinary.c')
| -rw-r--r-- | generic/tclBinary.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index f3d648f..c692b40 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -927,7 +927,7 @@ BinaryFormatCmd( goto badIndex; } if (count == BINARY_ALL) { - Tcl_GetByteArrayFromObj(objv[arg], &count); + TclGetByteArrayFromObj(objv[arg], &count); } else if (count == BINARY_NOCOUNT) { count = 1; } @@ -1091,8 +1091,8 @@ BinaryFormatCmd( char pad = (char) (cmd == 'a' ? '\0' : ' '); unsigned char *bytes; - bytes = Tcl_GetByteArrayFromObj(objv[arg++], &length); - + bytes = TclGetByteArrayFromObj(objv[arg], &length); + arg++; if (count == BINARY_ALL) { count = length; } else if (count == BINARY_NOCOUNT) { @@ -1404,7 +1404,7 @@ BinaryScanCmd( } numberCachePtr = &numberCacheHash; Tcl_InitHashTable(numberCachePtr, TCL_ONE_WORD_KEYS); - buffer = Tcl_GetByteArrayFromObj(objv[1], &length); + buffer = TclGetByteArrayFromObj(objv[1], &length); format = TclGetString(objv[2]); arg = 3; offset = 0; @@ -2453,7 +2453,7 @@ BinaryEncodeHex( } TclNewObj(resultObj); - data = Tcl_GetByteArrayFromObj(objv[1], &count); + data = TclGetByteArrayFromObj(objv[1], &count); cursor = Tcl_SetByteArrayLength(resultObj, count * 2); for (offset = 0; offset < count; ++offset) { *cursor++ = HexDigits[((data[offset] >> 4) & 0x0f)]; @@ -2648,7 +2648,7 @@ BinaryEncode64( } resultObj = Tcl_NewObj(); - data = Tcl_GetByteArrayFromObj(objv[objc-1], &count); + data = TclGetByteArrayFromObj(objv[objc-1], &count); if (count > 0) { size = (((count * 4) / 3) + 3) & ~3; /* ensure 4 byte chunks */ if (maxlen > 0 && size > maxlen) { @@ -2746,7 +2746,7 @@ BinaryEncodeUu( } break; case OPT_WRAPCHAR: - wrapchar = Tcl_GetByteArrayFromObj(objv[i+1], &wrapcharlen); + wrapchar = TclGetByteArrayFromObj(objv[i+1], &wrapcharlen); break; } } @@ -2758,7 +2758,7 @@ BinaryEncodeUu( resultObj = Tcl_NewObj(); offset = 0; - data = Tcl_GetByteArrayFromObj(objv[objc-1], &count); + data = TclGetByteArrayFromObj(objv[objc-1], &count); rawLength = (lineLength - 1) * 3 / 4; start = cursor = Tcl_SetByteArrayLength(resultObj, (lineLength + wrapcharlen) * |