From 276351d578c8b2519c728605c82fb4dc953177d4 Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Thu, 6 Nov 2014 09:24:01 -0500 Subject: [PATCH] fix jl_static_show formatting for long long printing (ref #8402) --- src/builtins.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/builtins.c b/src/builtins.c index 101b3923eb094..f298ade52a3eb 100644 --- a/src/builtins.c +++ b/src/builtins.c @@ -1162,32 +1162,32 @@ DLLEXPORT size_t jl_static_show(JL_STREAM *out, jl_value_t *v) n += JL_PRINTF(out, "#", *(uint32_t*)jl_data_ptr(v)); } else if (jl_is_int64(v)) { - n += JL_PRINTF(out, "%d", jl_unbox_int64(v)); + n += JL_PRINTF(out, "%lld", jl_unbox_int64(v)); } else if (jl_is_int32(v)) { n += JL_PRINTF(out, "%d", jl_unbox_int32(v)); } else if (jl_typeis(v,jl_int16_type)) { - n += JL_PRINTF(out, "%d", jl_unbox_int16(v)); + n += JL_PRINTF(out, "%hd", jl_unbox_int16(v)); } else if (jl_typeis(v,jl_int8_type)) { - n += JL_PRINTF(out, "%d", jl_unbox_int8(v)); + n += JL_PRINTF(out, "%hhd", jl_unbox_int8(v)); } else if (jl_is_uint64(v)) { - n += JL_PRINTF(out, "0x%016x", jl_unbox_uint64(v)); + n += JL_PRINTF(out, "0x%016llx", jl_unbox_uint64(v)); } else if (jl_is_uint32(v)) { n += JL_PRINTF(out, "0x%08x", jl_unbox_uint32(v)); } else if (jl_typeis(v,jl_uint16_type)) { - n += JL_PRINTF(out, "0x%04x", jl_unbox_uint16(v)); + n += JL_PRINTF(out, "0x%04hx", jl_unbox_uint16(v)); } else if (jl_typeis(v,jl_uint8_type)) { - n += JL_PRINTF(out, "0x%02x", jl_unbox_uint8(v)); + n += JL_PRINTF(out, "0x%02hhx", jl_unbox_uint8(v)); } else if (jl_is_cpointer(v)) { #ifdef _P64 - n += JL_PRINTF(out, "0x%016x", jl_unbox_voidpointer(v)); + n += JL_PRINTF(out, "0x%016llx", jl_unbox_voidpointer(v)); #else n += JL_PRINTF(out, "0x%08x", jl_unbox_voidpointer(v)); #endif