diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-12 14:33:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-12 14:33:26 (GMT) |
| commit | 0e012195337bcc712e327b92a9b051d729861e3b (patch) | |
| tree | 1a8d2a4ed44a638b1d6d27b99bafe1337aaf30cf | |
| parent | 18a7f14fd0d19e8b9b639edad0421bfe763078fd (diff) | |
| parent | 5ba18ec98dfa4afe775a3f7a7caa8d55774d907d (diff) | |
| download | tcl-0e012195337bcc712e327b92a9b051d729861e3b.zip tcl-0e012195337bcc712e327b92a9b051d729861e3b.tar.gz tcl-0e012195337bcc712e327b92a9b051d729861e3b.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclCkalloc.c | 2 | ||||
| -rw-r--r-- | generic/tclStringObj.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c index 3b365ca..e9c89d9 100644 --- a/generic/tclCkalloc.c +++ b/generic/tclCkalloc.c @@ -859,7 +859,7 @@ MemoryCmd( } if (strcmp(argv[1],"info") == 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "%-25s %10u\n%-25s %10u\n%-25s %10u\n%-25s %10" TCL_LL_MODIFIER"u\n%-25s %10u\n%-25s %10" TCL_LL_MODIFIER "u\n", + "%-25s %10u\n%-25s %10u\n%-25s %10u\n%-25s %10" TCL_LL_MODIFIER"d\n%-25s %10u\n%-25s %10" TCL_LL_MODIFIER "d\n", "total mallocs", total_mallocs, "total frees", total_frees, "current packets allocated", current_malloc_packets, "current bytes allocated", (Tcl_WideInt)current_bytes_malloced, diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 666c4cb..e820bd5 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2781,7 +2781,7 @@ TclStringRepeat( if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "string size overflow: unable to alloc %" - TCL_LL_MODIFIER "u bytes", + TCL_LL_MODIFIER "d bytes", (Tcl_WideUInt)STRING_SIZE(count*length))); Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL); } @@ -3005,7 +3005,7 @@ TclStringCatObjv( if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "concatenation failed: unable to alloc %" - TCL_LL_MODIFIER "u bytes", + TCL_LL_MODIFIER "d bytes", (Tcl_WideUInt)STRING_SIZE(length))); Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL); } @@ -3021,7 +3021,7 @@ TclStringCatObjv( if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "concatenation failed: unable to alloc %" - TCL_LL_MODIFIER "u bytes", + TCL_LL_MODIFIER "d bytes", (Tcl_WideUInt)STRING_SIZE(length))); Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL); } |