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

db/upnp: remove unnecessary m_superdir nullptr checks

This commit is contained in:
Max Kellermann 2014-01-18 16:02:21 +01:00
parent 1e99983263
commit 53573e950f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db/UpnpDatabasePlugin.cxx
View File

@ -215,7 +215,7 @@ upnpItemToSong(const UPnPDirObject &dirent, const char *uri)
Song * Song *
UpnpDatabase::GetSong(const char *uri, Error &error) const UpnpDatabase::GetSong(const char *uri, Error &error) const
{ {
if (!m_superdir || !m_superdir->ok()) { if (!m_superdir->ok()) {
error.Set(upnp_domain, error.Set(upnp_domain,
"UpnpDatabase::GetSong() superdir is sick"); "UpnpDatabase::GetSong() superdir is sick");
return nullptr; return nullptr;
@ -688,7 +688,7 @@ UpnpDatabase::Visit(const DatabaseSelection &selection,
Error &error) const Error &error) const
{ {
std::vector<ContentDirectoryService> servers; std::vector<ContentDirectoryService> servers;
if (!m_superdir || !m_superdir->ok() || if (!m_superdir->ok() ||
!m_superdir->getDirServices(servers)) { !m_superdir->getDirServices(servers)) {
error.Set(upnp_domain, error.Set(upnp_domain,
"UpnpDatabase::Visit() superdir is sick"); "UpnpDatabase::Visit() superdir is sick");
@ -748,7 +748,7 @@ UpnpDatabase::VisitUniqueTags(const DatabaseSelection &selection,
return true; return true;
std::vector<ContentDirectoryService> servers; std::vector<ContentDirectoryService> servers;
if (!m_superdir || !m_superdir->ok() || if (!m_superdir->ok() ||
!m_superdir->getDirServices(servers)) { !m_superdir->getDirServices(servers)) {
error.Set(upnp_domain, error.Set(upnp_domain,
"UpnpDatabase::Visit() superdir is sick"); "UpnpDatabase::Visit() superdir is sick");