summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-12-06 12:46:11 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-12-06 12:46:11 (GMT)
commitd58a6ddbc39b06ed1a8537870b69e272d06c793c (patch)
tree9ac903fbcedc73db9cde8b3eac7d9a48997e55fb
parent32b482d3bfa6ea3df6a3a2dac787f8a64f998b02 (diff)
parent0cd0bb6862a65142603ccbde70d3a894be70e9d4 (diff)
downloadtcl-d58a6ddbc39b06ed1a8537870b69e272d06c793c.zip
tcl-d58a6ddbc39b06ed1a8537870b69e272d06c793c.tar.gz
tcl-d58a6ddbc39b06ed1a8537870b69e272d06c793c.tar.bz2
merge trunk
-rw-r--r--generic/tclStringObj.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index f9c1ebd..9593b7c 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2713,7 +2713,8 @@ TclStringRepeat(
if (0 == Tcl_AttemptSetObjLength(objResultPtr, count*length)) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
- "string size overflow: unable to alloc %llu bytes",
+ "string size overflow: unable to alloc %"
+ TCL_LL_MODIFIER "u bytes",
(Tcl_WideUInt)STRING_SIZE(count*length)));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
}
@@ -2936,7 +2937,8 @@ TclStringCatObjv(
if (0 == Tcl_AttemptSetObjLength(objResultPtr, length)) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
- "concatenation failed: unable to alloc %llu bytes",
+ "concatenation failed: unable to alloc %"
+ TCL_LL_MODIFIER "u bytes",
(Tcl_WideUInt)STRING_SIZE(length)));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
}
@@ -2951,7 +2953,8 @@ TclStringCatObjv(
if (0 == Tcl_AttemptSetObjLength(objResultPtr, length)) {
if (interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
- "concatenation failed: unable to alloc %llu bytes",
+ "concatenation failed: unable to alloc %"
+ TCL_LL_MODIFIER "u bytes",
(Tcl_WideUInt)STRING_SIZE(length)));
Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
}