diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-02 08:13:28 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-02 08:56:27 +0200 |
| commit | 0214baad5affb78bf64c7774ba48693a3c6d15ee (patch) | |
| tree | 79c8c8c13a443f60007db87f65bcbe44941586f3 /src/PlaylistQueue.cxx | |
| parent | c2d3ed2acc9fdb9b0900b70d427d91b22684a8ec (diff) | |
| download | mpd-0214baad5affb78bf64c7774ba48693a3c6d15ee.tar.gz mpd-0214baad5affb78bf64c7774ba48693a3c6d15ee.tar.xz mpd-0214baad5affb78bf64c7774ba48693a3c6d15ee.zip | |
Playlist*: use nullptr instead of NULL
Diffstat (limited to '')
| -rw-r--r-- | src/PlaylistQueue.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PlaylistQueue.cxx b/src/PlaylistQueue.cxx index 901ee578d..2b9e346ea 100644 --- a/src/PlaylistQueue.cxx +++ b/src/PlaylistQueue.cxx @@ -35,10 +35,10 @@ playlist_load_into_queue(const char *uri, SongEnumerator &e, { enum playlist_result result; Song *song; - char *base_uri = uri != NULL ? g_path_get_dirname(uri) : NULL; + char *base_uri = uri != nullptr ? g_path_get_dirname(uri) : nullptr; for (unsigned i = 0; - i < end_index && (song = e.NextSong()) != NULL; + i < end_index && (song = e.NextSong()) != nullptr; ++i) { if (i < start_index) { /* skip songs before the start index */ @@ -47,7 +47,7 @@ playlist_load_into_queue(const char *uri, SongEnumerator &e, } song = playlist_check_translate_song(song, base_uri, secure); - if (song == NULL) + if (song == nullptr) continue; result = dest->AppendSong(*pc, song); @@ -74,7 +74,7 @@ playlist_open_into_queue(const char *uri, struct input_stream *is; auto playlist = playlist_open_any(uri, mutex, cond, &is); - if (playlist == NULL) + if (playlist == nullptr) return PLAYLIST_RESULT_NO_SUCH_LIST; enum playlist_result result = @@ -83,7 +83,7 @@ playlist_open_into_queue(const char *uri, dest, pc, secure); delete playlist; - if (is != NULL) + if (is != nullptr) is->Close(); return result; |