diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-21 15:28:09 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-21 15:28:09 (GMT) |
commit | ccd2ac73e91a76cec19cc2c52a1d5f489dd88ae7 (patch) | |
tree | a1c277681948338fd6e60cd50d302ee1d9bc344c /generic/tclBinary.c | |
parent | 6d64f87088894b818855270f1a8a7aea6ebfae0b (diff) | |
parent | 57f0eb9556674426578429b0bfe081f563e1ed63 (diff) | |
download | tcl-ccd2ac73e91a76cec19cc2c52a1d5f489dd88ae7.zip tcl-ccd2ac73e91a76cec19cc2c52a1d5f489dd88ae7.tar.gz tcl-ccd2ac73e91a76cec19cc2c52a1d5f489dd88ae7.tar.bz2 |
Merge 8.7
Diffstat (limited to 'generic/tclBinary.c')
-rw-r--r-- | generic/tclBinary.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 90efc9f..a7d6617 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -341,7 +341,7 @@ Tcl_SetByteArrayObj( * * Attempt to extract the value from objPtr in the representation * of a byte sequence. On success return the extracted byte sequence. - * On failures, return NULL and record error message and code in + * On failure, return NULL and record error message and code in * interp (if not NULL). * * Results: @@ -872,8 +872,7 @@ BinaryFormatCmd( * cursor has visited.*/ const char *errorString; const char *errorValue, *str; - size_t offset, size; - size_t length; + size_t offset, size, length; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "formatString ?arg ...?"); @@ -1379,8 +1378,7 @@ BinaryScanCmd( unsigned char *buffer; /* Start of result buffer. */ const char *errorString; const char *str; - size_t offset, size, i; - size_t length = 0; + size_t offset, size, length = 0, i; Tcl_Obj *valuePtr, *elementPtr; Tcl_HashTable numberCacheHash; @@ -1656,7 +1654,7 @@ BinaryScanCmd( if (count == BINARY_NOCOUNT) { count = 1; } - if ((count == BINARY_ALL) || (count > length - offset)) { + if ((count == BINARY_ALL) || (count > (length - offset))) { offset = length; } else { offset += count; |