diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-12 18:03:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-12 18:03:37 (GMT) |
| commit | f1752f51c91fe99938a7cc83ea61e37feeea9209 (patch) | |
| tree | 9640d1143e10b244fb190e73d7b027fccf2f3c3e | |
| parent | bc22d501c087d1efd7e636267677a31152c62e20 (diff) | |
| parent | 401b464a4d657490333388130b1fc7ae0d212646 (diff) | |
| download | tcl-f1752f51c91fe99938a7cc83ea61e37feeea9209.zip tcl-f1752f51c91fe99938a7cc83ea61e37feeea9209.tar.gz tcl-f1752f51c91fe99938a7cc83ea61e37feeea9209.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclBinary.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index a586f18..5ac08e9 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -73,7 +73,7 @@ static void UpdateStringOfByteArray(Tcl_Obj *listPtr); static void DeleteScanNumberCache(Tcl_HashTable *numberCachePtr); static int NeedReversing(int format); static void CopyNumber(const void *from, void *to, - unsigned length, int type); + unsigned int length, int type); /* Binary ensemble commands */ static Tcl_ObjCmdProc BinaryFormatCmd; static Tcl_ObjCmdProc BinaryScanCmd; @@ -560,7 +560,7 @@ TclGetByteArrayFromObj( *numBytesPtr = baPtr->used; #else /* TODO: What's going on here? Document or eliminate. */ - *numBytesPtr = ((size_t)(unsigned)(baPtr->used + 1)) - 1; + *numBytesPtr = ((size_t)(unsigned int)(baPtr->used + 1)) - 1; #endif } return baPtr->bytes; @@ -1928,7 +1928,7 @@ GetFormatSpec( (*formatPtr)++; *countPtr = BINARY_ALL; } else if (isdigit(UCHAR(**formatPtr))) { /* INTL: digit */ - unsigned long int count; + unsigned long count; errno = 0; count = strtoul(*formatPtr, (char **) formatPtr, 10); @@ -2884,7 +2884,8 @@ BinaryEncodeUu( { Tcl_Obj *resultObj; unsigned char *data, *start, *cursor; - int offset, count, rawLength, n, i, j, bits, index; + int offset, count, rawLength, i, j, bits, index; + unsigned int n; int lineLength = 61; const unsigned char SingleNewline[] = { UCHAR('\n') }; const unsigned char *wrapchar = SingleNewline; |