diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-21 16:33:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-21 16:33:29 (GMT) |
| commit | b714d266298b18489995ea64d1ebf37b7b51fe5c (patch) | |
| tree | 078dad3652cbec8ce769c8e196d7794a234f3557 | |
| parent | 28146e3fee39124075fa8c1776da56e6ebed616c (diff) | |
| parent | e3c67e088158312bf1d91f23ff22d9f67f87c016 (diff) | |
| download | tcl-b714d266298b18489995ea64d1ebf37b7b51fe5c.zip tcl-b714d266298b18489995ea64d1ebf37b7b51fe5c.tar.gz tcl-b714d266298b18489995ea64d1ebf37b7b51fe5c.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | doc/binary.n | 2 | ||||
| -rw-r--r-- | generic/tclInt.h | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/doc/binary.n b/doc/binary.n index 1a62ad6..c54bcc9 100644 --- a/doc/binary.n +++ b/doc/binary.n @@ -83,6 +83,8 @@ RFC 2045 calls for base64 decoders to be non-strict. . The \fBhex\fR binary encoding converts each byte to a pair of hexadecimal digits that represent the byte value as a hexadecimal integer. +When encoding, lower characters are used. +When decoding, upper and lower characters are accepted. .RS .PP No options are supported during encoding. During decoding, the following diff --git a/generic/tclInt.h b/generic/tclInt.h index 6aa7415..30d108b 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -4299,7 +4299,7 @@ TclScaleTime( */ # define TclAllocObjStorageEx(interp, objPtr) \ - (objPtr) = (Tcl_Obj *) Tcl_Alloc(sizeof(Tcl_Obj)) + (objPtr) = (Tcl_Obj *)Tcl_Alloc(sizeof(Tcl_Obj)) # define TclFreeObjStorageEx(interp, objPtr) \ Tcl_Free(objPtr) @@ -4608,20 +4608,20 @@ MODULE_SCOPE const TclFileAttrProcs tclpFileAttrProcs[]; if (allocated > TCL_MAX_TOKENS) { \ allocated = TCL_MAX_TOKENS; \ } \ - newPtr = (Tcl_Token *) Tcl_AttemptRealloc((char *) oldPtr, \ - (allocated * sizeof(Tcl_Token))); \ + newPtr = (Tcl_Token *)Tcl_AttemptRealloc((char *) oldPtr, \ + allocated * sizeof(Tcl_Token)); \ if (newPtr == NULL) { \ allocated = _needed + (append) + TCL_MIN_TOKEN_GROWTH; \ if (allocated > TCL_MAX_TOKENS) { \ allocated = TCL_MAX_TOKENS; \ } \ - newPtr = (Tcl_Token *) Tcl_Realloc((char *) oldPtr, \ - (allocated * sizeof(Tcl_Token))); \ + newPtr = (Tcl_Token *)Tcl_Realloc((char *) oldPtr, \ + allocated * sizeof(Tcl_Token)); \ } \ (available) = allocated; \ if (oldPtr == NULL) { \ memcpy(newPtr, staticPtr, \ - ((used) * sizeof(Tcl_Token))); \ + (used) * sizeof(Tcl_Token)); \ } \ (tokenPtr) = newPtr; \ } \ @@ -5027,12 +5027,12 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit; TCL_CT_ASSERT((nbytes)<=sizeof(Tcl_Obj)); \ TclIncrObjsAllocated(); \ TclAllocObjStorageEx((interp), (_objPtr)); \ - *(void **)&memPtr = (void *) (_objPtr); \ + *(void **)&(memPtr) = (void *) (_objPtr); \ } while (0) #define TclSmallFreeEx(interp, memPtr) \ do { \ - TclFreeObjStorageEx((interp), (Tcl_Obj *)memPtr); \ + TclFreeObjStorageEx((interp), (Tcl_Obj *)(memPtr)); \ TclIncrObjsFreed(); \ } while (0) @@ -5042,12 +5042,12 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit; Tcl_Obj *_objPtr; \ TCL_CT_ASSERT((nbytes)<=sizeof(Tcl_Obj)); \ TclNewObj(_objPtr); \ - *(void **)&memPtr = (void *) _objPtr; \ + *(void **)&(memPtr) = (void *)_objPtr; \ } while (0) #define TclSmallFreeEx(interp, memPtr) \ do { \ - Tcl_Obj *_objPtr = (Tcl_Obj *) memPtr; \ + Tcl_Obj *_objPtr = (Tcl_Obj *)(memPtr); \ _objPtr->bytes = NULL; \ _objPtr->typePtr = NULL; \ _objPtr->refCount = 1; \ |