Skip to content

M
mpd
Commit 53573e95 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

db/upnp: remove unnecessary m_superdir nullptr checks

parent 1e999832
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/db/UpnpDatabasePlugin.cxx
View file @ 53573e95
...@@ -215,7 +215,7 @@ upnpItemToSong(const UPnPDirObject &dirent, const char *uri) ...@@ -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, ...@@ -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, ...@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment