diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/idmap2/idmap2/Lookup.cpp | 4 | ||||
| -rw-r--r-- | cmds/idmap2/libidmap2/XmlParser.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmds/idmap2/idmap2/Lookup.cpp b/cmds/idmap2/idmap2/Lookup.cpp index 8323d0ba2415..437180d3d1be 100644 --- a/cmds/idmap2/idmap2/Lookup.cpp +++ b/cmds/idmap2/idmap2/Lookup.cpp @@ -71,7 +71,7 @@ Result<ResourceId> WARN_UNUSED ParseResReference(const AssetManager2& am, const } // next, try to parse as a package:type/name string - if (auto resid = am.GetResourceId(res, "", fallback_package)) { + if (auto resid = am.GetResourceId(res, "", fallback_package); resid.ok()) { return *resid; } @@ -94,7 +94,7 @@ void PrintValue(AssetManager2* const am, const AssetManager2::SelectedValue& val case Res_value::TYPE_STRING: { const ResStringPool* pool = am->GetStringPoolForCookie(value.cookie); out->append("\""); - if (auto str = pool->string8ObjectAt(value.data)) { + if (auto str = pool->string8ObjectAt(value.data); str.ok()) { out->append(*str); } } break; diff --git a/cmds/idmap2/libidmap2/XmlParser.cpp b/cmds/idmap2/libidmap2/XmlParser.cpp index 7c55b64566f2..4030b83b3a41 100644 --- a/cmds/idmap2/libidmap2/XmlParser.cpp +++ b/cmds/idmap2/libidmap2/XmlParser.cpp @@ -98,7 +98,7 @@ Result<std::string> XmlParser::Node::GetAttributeStringValue(const std::string& switch ((*value).dataType) { case Res_value::TYPE_STRING: { - if (auto str = parser_.getStrings().string8ObjectAt((*value).data)) { + if (auto str = parser_.getStrings().string8ObjectAt((*value).data); str.ok()) { return std::string(str->string()); } break; |