Replace strUnHex pair return type with optional<Blob>

This commit is contained in:
seelabs
2019-08-14 13:13:45 -07:00
parent 7912ee6f7b
commit 0a256247a0
13 changed files with 48 additions and 47 deletions

View File

@@ -477,12 +477,15 @@ static boost::optional<detail::STVar> parseLeaf (
try
{
auto [vBlob, validVBlob] = strUnHex (value.asString ());
if (! validVBlob)
if (auto vBlob = strUnHex(value.asString()))
{
ret = detail::make_stvar<STBlob>(
field, vBlob->data(), vBlob->size());
}
else
{
Throw<std::invalid_argument> ("invalid data");
ret = detail::make_stvar<STBlob>(field, vBlob.data(), vBlob.size());
}
}
catch (std::exception const&)
{