summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandy <andrew.m.goth@gmail.com>2016-12-02 21:08:15 (GMT)
committerandy <andrew.m.goth@gmail.com>2016-12-02 21:08:15 (GMT)
commit6da0c767cd83c18aa8a2c152ad6b0298ea4f28ab (patch)
tree4519e6ebd49f7160cb1163a1f72ff27686008f35
parentc9bee15d7360f859a1916da19733e2595caad00b (diff)
downloadtcl-6da0c767cd83c18aa8a2c152ad6b0298ea4f28ab.zip
tcl-6da0c767cd83c18aa8a2c152ad6b0298ea4f28ab.tar.gz
tcl-6da0c767cd83c18aa8a2c152ad6b0298ea4f28ab.tar.bz2
Avoid "warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int'" on platforms where TCL_WIDE_INT_IS_LONG. Warning introduced by check-in [e3ba334a42] which was merged to trunk by [eac13870dc]. This fix also was made by [418b169207] which has not yet been merged to 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 4b171f3..9471381 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2712,7 +2712,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);
}
@@ -2935,7 +2936,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);
}
@@ -2950,7 +2952,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);
}