Avoid a -Wc++11-narrowing warning.

This commit is contained in:
Nigel Tao committed 2017-11-03 11:44:35 +11:00
1 parent 94eba81892
commit 346b3d4107
3 files changed
+41 -37

No files matched your search

+3 -3
View File
@@ -181,7 +181,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if isInSrc(g.tm, n, t.KeySinceMark, 0) {
b.printf("((puffs_base__slice_u8){ "+
".ptr = %ssrc.private_impl.mark, "+
".len = %ssrc.private_impl.mark ? %srptr_src - %ssrc.private_impl.mark : 0, })",
".len = %ssrc.private_impl.mark ? (size_t)(%srptr_src - %ssrc.private_impl.mark) : 0, })",
aPrefix, aPrefix, bPrefix, aPrefix)
return nil
}
@@ -199,7 +199,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if isInDst(g.tm, n, t.KeySinceMark, 0) {
b.printf("((puffs_base__slice_u8){ "+
".ptr = %sdst.private_impl.mark, "+
".len = %sdst.private_impl.mark ? %swptr_dst - %sdst.private_impl.mark : 0, })",
".len = %sdst.private_impl.mark ? (size_t)(%swptr_dst - %sdst.private_impl.mark) : 0, })",
aPrefix, aPrefix, bPrefix, aPrefix)
return nil
}
@@ -318,7 +318,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
// TODO: don't hard-code v_r or b_rptr_src.
b.printf("((puffs_base__slice_u8){ " +
".ptr = v_r.private_impl.mark, " +
".len = v_r.private_impl.mark ? b_rptr_src - v_r.private_impl.mark : 0, })")
".len = v_r.private_impl.mark ? (size_t)(b_rptr_src - v_r.private_impl.mark) : 0, })")
return nil
}
// TODO.
+22 -19
View File
@@ -916,8 +916,9 @@ puffs_flate__status puffs_flate__flate_decoder__decode(
}
v_written = ((puffs_base__slice_u8){
.ptr = a_dst.private_impl.mark,
.len = a_dst.private_impl.mark ? b_wptr_dst - a_dst.private_impl.mark
: 0,
.len = a_dst.private_impl.mark
? (size_t)(b_wptr_dst - a_dst.private_impl.mark)
: 0,
});
if (((uint64_t)(v_written.len)) >= 32768) {
v_written = puffs_base__slice_u8_suffix(v_written, 32768);
@@ -1551,23 +1552,25 @@ puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
v_n_copied = 0;
while (true) {
if (((uint64_t)(v_distance)) >
((uint64_t)(((puffs_base__slice_u8){
.ptr = a_dst.private_impl.mark,
.len = a_dst.private_impl.mark
? b_wptr_dst - a_dst.private_impl.mark
: 0,
})
.len))) {
((uint64_t)(
((puffs_base__slice_u8){
.ptr = a_dst.private_impl.mark,
.len = a_dst.private_impl.mark
? (size_t)(b_wptr_dst - a_dst.private_impl.mark)
: 0,
})
.len))) {
v_hlen = 0;
v_hdist = ((uint32_t)((
((uint64_t)(v_distance)) -
((uint64_t)(((puffs_base__slice_u8){
.ptr = a_dst.private_impl.mark,
.len = a_dst.private_impl.mark
? b_wptr_dst - a_dst.private_impl.mark
: 0,
})
.len)))));
v_hdist = ((uint32_t)(
(((uint64_t)(v_distance)) -
((uint64_t)(((puffs_base__slice_u8){
.ptr = a_dst.private_impl.mark,
.len = a_dst.private_impl.mark
? (size_t)(b_wptr_dst -
a_dst.private_impl.mark)
: 0,
})
.len)))));
if (v_length > v_hdist) {
v_length -= v_hdist;
v_hlen = v_hdist;
@@ -2436,7 +2439,7 @@ puffs_flate__status puffs_flate__zlib_decoder__decode(
((puffs_base__slice_u8){
.ptr = a_dst.private_impl.mark,
.len = a_dst.private_impl.mark
? b_wptr_dst - a_dst.private_impl.mark
? (size_t)(b_wptr_dst - a_dst.private_impl.mark)
: 0,
}));
if (v_z == 0) {
+16 -15
View File
@@ -1266,24 +1266,25 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
goto label_1_break;
}
if (v_block_size <
((uint64_t)(((puffs_base__slice_u8){
.ptr = v_r.private_impl.mark,
.len = v_r.private_impl.mark
? b_rptr_src - v_r.private_impl.mark
: 0,
})
.len))) {
((uint64_t)(
((puffs_base__slice_u8){
.ptr = v_r.private_impl.mark,
.len = v_r.private_impl.mark
? (size_t)(b_rptr_src - v_r.private_impl.mark)
: 0,
})
.len))) {
status = PUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_LIMITED_READ;
goto exit;
}
v_block_size -=
((uint64_t)(((puffs_base__slice_u8){
.ptr = v_r.private_impl.mark,
.len = v_r.private_impl.mark
? b_rptr_src - v_r.private_impl.mark
: 0,
})
.len));
v_block_size -= ((uint64_t)(
((puffs_base__slice_u8){
.ptr = v_r.private_impl.mark,
.len = v_r.private_impl.mark
? (size_t)(b_rptr_src - v_r.private_impl.mark)
: 0,
})
.len));
if ((v_block_size == 0) && (v_z == PUFFS_GIF__SUSPENSION_SHORT_READ)) {
goto label_1_break;
}