Commit 66503146 authored by Max Kellermann's avatar Max Kellermann

db/proxy, output/shout: fix implicit nullptr/bool conversion

Return false on error, not nullptr.
parent df331711
...@@ -592,7 +592,7 @@ ProxyDatabase::Visit(const DatabaseSelection &selection, ...@@ -592,7 +592,7 @@ ProxyDatabase::Visit(const DatabaseSelection &selection,
{ {
// TODO: eliminate the const_cast // TODO: eliminate the const_cast
if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error)) if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error))
return nullptr; return false;
if (!visit_directory && !visit_playlist && selection.recursive && if (!visit_directory && !visit_playlist && selection.recursive &&
(ServerSupportsSearchBase(connection) (ServerSupportsSearchBase(connection)
...@@ -617,7 +617,7 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection, ...@@ -617,7 +617,7 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection,
{ {
// TODO: eliminate the const_cast // TODO: eliminate the const_cast
if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error)) if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error))
return nullptr; return false;
enum mpd_tag_type tag_type2 = Convert(tag_type); enum mpd_tag_type tag_type2 = Convert(tag_type);
if (tag_type2 == MPD_TAG_COUNT) { if (tag_type2 == MPD_TAG_COUNT) {
...@@ -657,7 +657,7 @@ ProxyDatabase::GetStats(const DatabaseSelection &selection, ...@@ -657,7 +657,7 @@ ProxyDatabase::GetStats(const DatabaseSelection &selection,
// TODO: eliminate the const_cast // TODO: eliminate the const_cast
if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error)) if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error))
return nullptr; return false;
struct mpd_stats *stats2 = struct mpd_stats *stats2 =
mpd_run_stats(connection); mpd_run_stats(connection);
......
...@@ -114,7 +114,7 @@ ShoutOutput::Configure(const config_param &param, Error &error) ...@@ -114,7 +114,7 @@ ShoutOutput::Configure(const config_param &param, Error &error)
if (!audio_format.IsFullyDefined()) { if (!audio_format.IsFullyDefined()) {
error.Set(config_domain, error.Set(config_domain,
"Need full audio format specification"); "Need full audio format specification");
return nullptr; return false;
} }
const char *host = require_block_string(param, "host"); const char *host = require_block_string(param, "host");
......
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