From 137ca3ed732582db5865ac180ab3953e19a60296 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 25 Jul 2020 00:03:54 +1000 Subject: [PATCH] Fix -Werror=conversion in std/cbor decode_tokens --- release/c/wuffs-unsupported-snapshot.c | 2 +- std/cbor/decode_cbor.wuffs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index dcb49d4e..3f89e628 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -16512,7 +16512,7 @@ wuffs_cbor__decoder__decode_tokens( goto label__goto_parsed_a_leaf_value__break; } (iop_a_src += 1, wuffs_base__make_empty_struct()); - v_c_major = (v_c >> 5); + v_c_major = ((uint8_t)((v_c >> 5))); v_c_minor = (v_c & 31); if (v_c_minor < 24) { v_string_length = ((uint64_t)(v_c_minor)); diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index 1fdf3ffb..4db9c569 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -157,7 +157,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor } args.src.skip_u32_fast!(actual: 1, worst_case: 1) - c_major = c >> 5 + c_major = (c >> 5) as base.u8 c_minor = c & 0x1F if c_minor < 0x18 { string_length = c_minor as base.u64