diff options
| author | Tim Peters <tim@python.org> | 2013-09-05 23:04:26 -0500 |
|---|---|---|
| committer | Tim Peters <tim@python.org> | 2013-09-05 23:04:26 -0500 |
| commit | b2372959abba41f268674df48da35e1b9f9d3529 (patch) | |
| tree | 70d34d3549f941c30237a83fde9586fc6df356b3 | |
| parent | db2c6819ba3ca142afc406101b0ba498f387ca66 (diff) | |
| parent | eaa3bcc370cffe080e637fc1af592add9ff59793 (diff) | |
| download | cpython-git-b2372959abba41f268674df48da35e1b9f9d3529.tar.gz | |
Nerge 3.3 into default.
Issue #18942: sys._debugmallocstats() output was damaged on Windows.
_PyDebugAllocatorStats() called PyOS_snprintf() with a %zd format
code, but MS doesn't support that code. Interpolated
PY_FORMAT_SIZE_T in place of the "z".
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/obmalloc.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -10,6 +10,8 @@ Projected Release date: 2013-09-08 Core and Builtins ----------------- +- Issue #18942: sys._debugmallocstats() output was damaged on Windows. + - Issue #18571: Implementation of the PEP 446: file descriptors and file handles are now created non-inheritable; add functions os.get/set_inheritable(), os.get/set_handle_inheritable() and diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index f1462225a0..db774b8423 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -2035,7 +2035,7 @@ _PyDebugAllocatorStats(FILE *out, char buf1[128]; char buf2[128]; PyOS_snprintf(buf1, sizeof(buf1), - "%d %ss * %zd bytes each", + "%d %ss * %" PY_FORMAT_SIZE_T "d bytes each", num_blocks, block_name, sizeof_block); PyOS_snprintf(buf2, sizeof(buf2), "%48s ", buf1); |