Skip to content

Commit b714d26

Browse files
author
jan.nijtmans
committed
Merge 8.7
2 parents 28146e3 + e3c67e0 commit b714d26

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

doc/binary.n

+2
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ RFC 2045 calls for base64 decoders to be non-strict.
8383
.
8484
The \fBhex\fR binary encoding converts each byte to a pair of hexadecimal
8585
digits that represent the byte value as a hexadecimal integer.
86+
When encoding, lower characters are used.
87+
When decoding, upper and lower characters are accepted.
8688
.RS
8789
.PP
8890
No options are supported during encoding. During decoding, the following

generic/tclInt.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -4299,7 +4299,7 @@ TclScaleTime(
42994299
*/
43004300

43014301
# define TclAllocObjStorageEx(interp, objPtr) \
4302-
(objPtr) = (Tcl_Obj *) Tcl_Alloc(sizeof(Tcl_Obj))
4302+
(objPtr) = (Tcl_Obj *)Tcl_Alloc(sizeof(Tcl_Obj))
43034303

43044304
# define TclFreeObjStorageEx(interp, objPtr) \
43054305
Tcl_Free(objPtr)
@@ -4608,20 +4608,20 @@ MODULE_SCOPE const TclFileAttrProcs tclpFileAttrProcs[];
46084608
if (allocated > TCL_MAX_TOKENS) { \
46094609
allocated = TCL_MAX_TOKENS; \
46104610
} \
4611-
newPtr = (Tcl_Token *) Tcl_AttemptRealloc((char *) oldPtr, \
4612-
(allocated * sizeof(Tcl_Token))); \
4611+
newPtr = (Tcl_Token *)Tcl_AttemptRealloc((char *) oldPtr, \
4612+
allocated * sizeof(Tcl_Token)); \
46134613
if (newPtr == NULL) { \
46144614
allocated = _needed + (append) + TCL_MIN_TOKEN_GROWTH; \
46154615
if (allocated > TCL_MAX_TOKENS) { \
46164616
allocated = TCL_MAX_TOKENS; \
46174617
} \
4618-
newPtr = (Tcl_Token *) Tcl_Realloc((char *) oldPtr, \
4619-
(allocated * sizeof(Tcl_Token))); \
4618+
newPtr = (Tcl_Token *)Tcl_Realloc((char *) oldPtr, \
4619+
allocated * sizeof(Tcl_Token)); \
46204620
} \
46214621
(available) = allocated; \
46224622
if (oldPtr == NULL) { \
46234623
memcpy(newPtr, staticPtr, \
4624-
((used) * sizeof(Tcl_Token))); \
4624+
(used) * sizeof(Tcl_Token)); \
46254625
} \
46264626
(tokenPtr) = newPtr; \
46274627
} \
@@ -5027,12 +5027,12 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
50275027
TCL_CT_ASSERT((nbytes)<=sizeof(Tcl_Obj)); \
50285028
TclIncrObjsAllocated(); \
50295029
TclAllocObjStorageEx((interp), (_objPtr)); \
5030-
*(void **)&memPtr = (void *) (_objPtr); \
5030+
*(void **)&(memPtr) = (void *) (_objPtr); \
50315031
} while (0)
50325032

50335033
#define TclSmallFreeEx(interp, memPtr) \
50345034
do { \
5035-
TclFreeObjStorageEx((interp), (Tcl_Obj *)memPtr); \
5035+
TclFreeObjStorageEx((interp), (Tcl_Obj *)(memPtr)); \
50365036
TclIncrObjsFreed(); \
50375037
} while (0)
50385038

@@ -5042,12 +5042,12 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
50425042
Tcl_Obj *_objPtr; \
50435043
TCL_CT_ASSERT((nbytes)<=sizeof(Tcl_Obj)); \
50445044
TclNewObj(_objPtr); \
5045-
*(void **)&memPtr = (void *) _objPtr; \
5045+
*(void **)&(memPtr) = (void *)_objPtr; \
50465046
} while (0)
50475047

50485048
#define TclSmallFreeEx(interp, memPtr) \
50495049
do { \
5050-
Tcl_Obj *_objPtr = (Tcl_Obj *) memPtr; \
5050+
Tcl_Obj *_objPtr = (Tcl_Obj *)(memPtr); \
50515051
_objPtr->bytes = NULL; \
50525052
_objPtr->typePtr = NULL; \
50535053
_objPtr->refCount = 1; \

0 commit comments

Comments
 (0)