aboutsummaryrefslogtreecommitdiffstats
path: root/src/PlaylistAny.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-02 08:13:28 +0200
committerMax Kellermann <max@duempel.org>2013-10-02 08:56:27 +0200
commit0214baad5affb78bf64c7774ba48693a3c6d15ee (patch)
tree79c8c8c13a443f60007db87f65bcbe44941586f3 /src/PlaylistAny.cxx
parentc2d3ed2acc9fdb9b0900b70d427d91b22684a8ec (diff)
downloadmpd-0214baad5affb78bf64c7774ba48693a3c6d15ee.tar.gz
mpd-0214baad5affb78bf64c7774ba48693a3c6d15ee.tar.xz
mpd-0214baad5affb78bf64c7774ba48693a3c6d15ee.zip
Playlist*: use nullptr instead of NULL
Diffstat (limited to 'src/PlaylistAny.cxx')
-rw-r--r--src/PlaylistAny.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/PlaylistAny.cxx b/src/PlaylistAny.cxx
index 95f65dca5..f0d044ca6 100644
--- a/src/PlaylistAny.cxx
+++ b/src/PlaylistAny.cxx
@@ -34,25 +34,25 @@ playlist_open_remote(const char *uri, Mutex &mutex, Cond &cond,
assert(uri_has_scheme(uri));
SongEnumerator *playlist = playlist_list_open_uri(uri, mutex, cond);
- if (playlist != NULL) {
- *is_r = NULL;
+ if (playlist != nullptr) {
+ *is_r = nullptr;
return playlist;
}
Error error;
input_stream *is = input_stream::Open(uri, mutex, cond, error);
- if (is == NULL) {
+ if (is == nullptr) {
if (error.IsDefined())
g_warning("Failed to open %s: %s",
uri, error.GetMessage());
- return NULL;
+ return nullptr;
}
playlist = playlist_list_open_stream(is, uri);
- if (playlist == NULL) {
+ if (playlist == nullptr) {
is->Close();
- return NULL;
+ return nullptr;
}
*is_r = is;