Skip to content

Commit 2da8bbf

Browse files
committed
Made the code more clear
1 parent c6c3f16 commit 2da8bbf

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

include/msgpack23/msgpack23.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -587,8 +587,8 @@ namespace msgpack23 {
587587

588588
[[nodiscard]] std::size_t unpack_map_header() {
589589
std::size_t map_size = 0;
590-
if (read_conditional<FormatConstants::map32, std::uint32_t>(map_size)) {
591-
} else if (read_conditional<FormatConstants::map16, std::uint16_t>(map_size)) {
590+
if (read_conditional<FormatConstants::map32, std::uint32_t>(map_size)
591+
or read_conditional<FormatConstants::map16, std::uint16_t>(map_size)) {
592592
} else {
593593
map_size = std::to_integer<std::size_t>(current() & static_cast<std::byte>(0b00001111));
594594
increment();
@@ -598,8 +598,8 @@ namespace msgpack23 {
598598

599599
[[nodiscard]] std::size_t unpack_array_header() {
600600
std::size_t array_size = 0;
601-
if (read_conditional<FormatConstants::array32, std::uint32_t>(array_size)) {
602-
} else if (read_conditional<FormatConstants::array16, std::uint16_t>(array_size)) {
601+
if (read_conditional<FormatConstants::array32, std::uint32_t>(array_size)
602+
or read_conditional<FormatConstants::array16, std::uint16_t>(array_size)) {
603603
} else {
604604
array_size = std::to_integer<std::size_t>(current() & static_cast<std::byte>(0b00001111));
605605
increment();
@@ -745,7 +745,7 @@ namespace msgpack23 {
745745
}
746746
case FormatConstants::ext8: {
747747
increment();
748-
auto const _ = read_integral<std::uint8_t>();
748+
[[maybe_unused]] auto const size = read_integral<std::uint8_t>();
749749
if (static_cast<std::int8_t>(current()) == -1) {
750750
increment();
751751
auto const nano_seconds = read_integral<std::uint32_t>();
@@ -999,9 +999,9 @@ namespace msgpack23 {
999999

10001000
void unpack_type(std::string &value) {
10011001
std::size_t str_size = 0;
1002-
if (read_conditional<FormatConstants::str32, std::uint32_t>(str_size)) {
1003-
} else if (read_conditional<FormatConstants::str16, std::uint16_t>(str_size)) {
1004-
} else if (read_conditional<FormatConstants::str8, std::uint8_t>(str_size)) {
1002+
if (read_conditional<FormatConstants::str32, std::uint32_t>(str_size)
1003+
or read_conditional<FormatConstants::str16, std::uint16_t>(str_size)
1004+
or read_conditional<FormatConstants::str8, std::uint8_t>(str_size)) {
10051005
} else {
10061006
str_size = std::to_integer<std::size_t>(current() & static_cast<std::byte>(0b00011111));
10071007
increment();
@@ -1015,9 +1015,9 @@ namespace msgpack23 {
10151015

10161016
void unpack_type(std::vector<std::uint8_t> &value) {
10171017
std::size_t bin_size = 0;
1018-
if (read_conditional<FormatConstants::bin32, std::uint32_t>(bin_size)) {
1019-
} else if (read_conditional<FormatConstants::bin16, std::uint16_t>(bin_size)) {
1020-
} else if (read_conditional<FormatConstants::bin8, std::uint8_t>(bin_size)) {
1018+
if (read_conditional<FormatConstants::bin32, std::uint32_t>(bin_size)
1019+
or read_conditional<FormatConstants::bin16, std::uint16_t>(bin_size)
1020+
or read_conditional<FormatConstants::bin8, std::uint8_t>(bin_size)) {
10211021
} else {
10221022
throw std::logic_error("Unexpected value");
10231023
}

0 commit comments

Comments
 (0)