summaryrefslogtreecommitdiffstats
path: root/generic/tclInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-02-01 20:36:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-02-01 20:36:01 (GMT)
commiteee14742522aed25744851879c80a96134de7369 (patch)
tree5650ddb981ce76c5b4348123db6def9c4be1aa68 /generic/tclInt.h
parenta6ecb97fa5846d7930c9649f008c490d06e8b054 (diff)
parent3106f9a6955f9df9de5df5879319b6e4393ab702 (diff)
downloadtcl-eee14742522aed25744851879c80a96134de7369.zip
tcl-eee14742522aed25744851879c80a96134de7369.tar.gz
tcl-eee14742522aed25744851879c80a96134de7369.tar.bz2
Another (big) round of int -> size_t enhancements. So Tcl can handle string >2GiB in more places.
Diffstat (limited to 'generic/tclInt.h')
-rw-r--r--generic/tclInt.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 3928cea..08f0606 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4395,7 +4395,7 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
#define TclGetByteArrayFromObj(objPtr, lenPtr) \
(Tcl_GetByteArrayFromObj(objPtr, NULL), \
*(lenPtr) = *((size_t *) (objPtr)->internalRep.twoPtrValue.ptr1), \
- Tcl_GetByteArrayFromObj(objPtr, NULL))
+ (unsigned char *)(((size_t *) (objPtr)->internalRep.twoPtrValue.ptr1) + 2))
#endif
/*
@@ -4493,19 +4493,19 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
allocated = TCL_MAX_TOKENS; \
} \
newPtr = (Tcl_Token *) Tcl_AttemptRealloc((char *) oldPtr, \
- (unsigned int) (allocated * sizeof(Tcl_Token))); \
+ (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, \
- (unsigned int) (allocated * sizeof(Tcl_Token))); \
+ (allocated * sizeof(Tcl_Token))); \
} \
(available) = allocated; \
if (oldPtr == NULL) { \
memcpy(newPtr, staticPtr, \
- (size_t) ((used) * sizeof(Tcl_Token))); \
+ ((used) * sizeof(Tcl_Token))); \
} \
(tokenPtr) = newPtr; \
} \