diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-26 14:31:00 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:34:03 +0100 |
| commit | 163597ef6939e4250afafe12f821aa732b1fc2b7 (patch) | |
| tree | 0c69d95f66789dd27788e28638a99d3a32956eef | |
| parent | 95f84afd338a9333b2fcf05dc171ce1dad6fbe7c (diff) | |
| download | mpd-163597ef6939e4250afafe12f821aa732b1fc2b7.tar.gz mpd-163597ef6939e4250afafe12f821aa732b1fc2b7.tar.xz mpd-163597ef6939e4250afafe12f821aa732b1fc2b7.zip | |
db/simple: fix implicit nullptr/bool conversion
Return false on error, not nullptr.
| -rw-r--r-- | src/db/plugins/simple/SimpleDatabasePlugin.cxx | 6 | ||||
| -rw-r--r-- | src/pcm/FormatConverter.cxx | 2 | ||||
| -rw-r--r-- | src/storage/plugins/NfsStorage.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index a0472462a..d6ad5e91f 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -448,13 +448,13 @@ SimpleDatabase::Mount(const char *uri, Database *db, Error &error) if (r.uri == nullptr) { error.Format(db_domain, DB_CONFLICT, "Already exists: %s", uri); - return nullptr; + return false; } if (strchr(r.uri, '/') != nullptr) { error.Format(db_domain, DB_NOT_FOUND, "Parent not found: %s", uri); - return nullptr; + return false; } Directory *mnt = r.directory->CreateChild(r.uri); @@ -481,7 +481,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri, if (cache_path.IsNull()) { error.Format(db_domain, DB_NOT_FOUND, "No 'cache_directory' configured"); - return nullptr; + return false; } std::string name(storage_uri); diff --git a/src/pcm/FormatConverter.cxx b/src/pcm/FormatConverter.cxx index b058b32f5..8874e1b3c 100644 --- a/src/pcm/FormatConverter.cxx +++ b/src/pcm/FormatConverter.cxx @@ -44,7 +44,7 @@ PcmFormatConverter::Open(SampleFormat _src_format, SampleFormat _dest_format, "PCM conversion from %s to %s is not implemented", sample_format_to_string(_src_format), sample_format_to_string(_dest_format)); - return nullptr; + return false; case SampleFormat::S16: case SampleFormat::S24_P32: diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index 823d662c5..324b40b6f 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -288,7 +288,7 @@ NfsStorage::GetInfo(const char *uri_utf8, gcc_unused bool follow, return false; if (!WaitConnected(error)) - return nullptr; + return false; NfsGetInfoOperation operation(*connection, path.c_str(), info); return operation.Run(error); |