diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
| commit | 20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch) | |
| tree | fa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/playlist/EmbeddedCuePlaylistPlugin.cxx | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/playlist/EmbeddedCuePlaylistPlugin.cxx')
| -rw-r--r-- | src/playlist/EmbeddedCuePlaylistPlugin.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx index b21d78daa..d758650eb 100644 --- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx @@ -97,7 +97,7 @@ embcue_playlist_open_uri(const char *uri, { if (!PathTraits::IsAbsoluteUTF8(uri)) /* only local files supported */ - return NULL; + return nullptr; const auto path_fs = AllocatedPath::FromUTF8(uri); if (path_fs.IsNull()) @@ -115,7 +115,7 @@ embcue_playlist_open_uri(const char *uri, if (playlist->cuesheet.empty()) { /* no "CUESHEET" tag found */ delete playlist; - return NULL; + return nullptr; } playlist->filename = PathTraits::GetBaseUTF8(uri); @@ -130,13 +130,13 @@ Song * EmbeddedCuePlaylist::NextSong() { Song *song = parser->Get(); - if (song != NULL) + if (song != nullptr) return song; while (*next != 0) { const char *line = next; char *eol = strpbrk(next, "\r\n"); - if (eol != NULL) { + if (eol != nullptr) { /* null-terminate the line */ *eol = 0; next = eol + 1; @@ -147,13 +147,13 @@ EmbeddedCuePlaylist::NextSong() parser->Feed(line); song = parser->Get(); - if (song != NULL) + if (song != nullptr) return song->ReplaceURI(filename.c_str()); } parser->Finish(); song = parser->Get(); - if (song != NULL) + if (song != nullptr) song = song->ReplaceURI(filename.c_str()); return song; } @@ -167,7 +167,7 @@ static const char *const embcue_playlist_suffixes[] = { "ape", "wv", "ogg", "oga", - NULL + nullptr }; const struct playlist_plugin embcue_playlist_plugin = { |