From 16b51dd2a4b147ca86597ec7bbdb299e2df3cad5 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 31 Oct 2021 16:27:47 +1100 Subject: [PATCH] Fix -Wshadow warnings --- internal/cgen/auxiliary/base.cc | 11 ++++++----- release/c/wuffs-unsupported-snapshot.c | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/cgen/auxiliary/base.cc b/internal/cgen/auxiliary/base.cc index e342983f..40a4414c 100644 --- a/internal/cgen/auxiliary/base.cc +++ b/internal/cgen/auxiliary/base.cc @@ -172,11 +172,12 @@ HandleMetadata( return ErrMsg_MaxInclMetadataLengthExceeded; } else if (io_buf.reader_position() > r.min_incl) { return ErrMsg_UnsupportedMetadata; - } - std::string error_message = - AdvanceIOBufferTo(input, io_buf, r.min_incl); - if (!error_message.empty()) { - return error_message; + } else { + std::string error_message = + AdvanceIOBufferTo(input, io_buf, r.min_incl); + if (!error_message.empty()) { + return error_message; + } } for (uint64_t num_to_copy = r.length(); num_to_copy > 0;) { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 000f2350..0b254b27 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -40321,11 +40321,12 @@ HandleMetadata( return ErrMsg_MaxInclMetadataLengthExceeded; } else if (io_buf.reader_position() > r.min_incl) { return ErrMsg_UnsupportedMetadata; - } - std::string error_message = - AdvanceIOBufferTo(input, io_buf, r.min_incl); - if (!error_message.empty()) { - return error_message; + } else { + std::string error_message = + AdvanceIOBufferTo(input, io_buf, r.min_incl); + if (!error_message.empty()) { + return error_message; + } } for (uint64_t num_to_copy = r.length(); num_to_copy > 0;) {