oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/upnp/Directory: simplify checkobjok()

Browse Source
This commit is contained in:
Max Kellermann 2014-01-10 22:03:01 +01:00
parent 70e5ab3fde
commit 1b8053a618
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/db/upnp/Directory.cxx
View File

@ -126,21 +126,21 @@ protected:
} }
bool checkobjok() { bool checkobjok() {
bool ok = !m_tobj.m_id.empty() && !m_tobj.m_pid.empty() && if (m_tobj.m_id.empty() || m_tobj.m_pid.empty() ||
!m_tobj.m_title.empty(); m_tobj.m_title.empty())
return false;
if (ok && m_tobj.type == UPnPDirObject::Type::ITEM) { if (m_tobj.type == UPnPDirObject::Type::ITEM) {
const char *item_class_name = const char *item_class_name =
m_tobj.m_props["upnp:class"].c_str(); m_tobj.m_props["upnp:class"].c_str();
auto item_class = ParseItemClass(item_class_name); auto item_class = ParseItemClass(item_class_name);
if (item_class == UPnPDirObject::ItemClass::UNKNOWN) { if (item_class == UPnPDirObject::ItemClass::UNKNOWN)
ok = false; return false;
} else {
m_tobj.item_class = item_class; m_tobj.item_class = item_class;
}
} }
return ok; return true;
} }
virtual void EndElement(const XML_Char *name) virtual void EndElement(const XML_Char *name)