Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Replace deep nesting with result short-circuit idiom

Browse source
This commit is contained in:
cryptocode 2018-01-21 04:02:26 +01:00 • committed by androm3da
commit 84528f26e7
1 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
rai/node/common.cpp
View file

@ -54,36 +54,18 @@ void rai::message::write_header (rai::stream & stream_a)
bool rai::message::read_header (rai::stream & stream_a, uint8_t & version_max_a, uint8_t & version_using_a, uint8_t & version_min_a, rai::message_type & type_a, std::bitset<16> & extensions_a)
{
uint16_t extensions_l;
std::array<uint8_t, 2> magic_number_l;
auto result (rai::read (stream_a, magic_number_l));
result = result || magic_number_l != magic_number;
result = result || rai::read (stream_a, version_max_a);
result = result || rai::read (stream_a, version_using_a);
result = result || rai::read (stream_a, version_min_a);
result = result || rai::read (stream_a, type_a);
result = result || rai::read (stream_a, extensions_l);
if (!result)
{
result = magic_number_l != magic_number;
if (!result)
{
result = rai::read (stream_a, version_max_a);
if (!result)
{
result = rai::read (stream_a, version_using_a);
if (!result)
{
result = rai::read (stream_a, version_min_a);
if (!result)
{
result = rai::read (stream_a, type_a);
if (!result)
{
uint16_t extensions_l;
result = rai::read (stream_a, extensions_l);
if (!result)
{
extensions_a = extensions_l;
}
}
}
}
}
}
extensions_a = extensions_l;
}
return result;
}