Fix -Wshadow warnings

This commit is contained in:
Nigel Tao committed 2021-10-31 16:27:47 +11:00
1 parent badce3ffa4
commit 16b51dd2a4
2 files changed
+12 -10

No files matched your search

+6 -5
View File
@@ -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;) {
+6 -5
View File
@@ -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;) {