diff options
author | Max Kellermann <max@duempel.org> | 2014-08-07 00:06:02 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-08-07 00:06:02 +0200 |
commit | 69ae879c585039297951821e353f7c1ca12b6cb8 (patch) | |
tree | fe394a053d2a45817e934f926be6ee660ba689a8 /src/playlist/plugins/M3uPlaylistPlugin.cxx | |
parent | 08fee9a284cc082822392b38574fd2d4b0afb843 (diff) | |
download | mpd-69ae879c585039297951821e353f7c1ca12b6cb8.tar.gz mpd-69ae879c585039297951821e353f7c1ca12b6cb8.tar.xz mpd-69ae879c585039297951821e353f7c1ca12b6cb8.zip |
input/TextInputStream: return char*
Revert to the old API before commit e9e55b08, removing unnecessary
bloat.
Diffstat (limited to 'src/playlist/plugins/M3uPlaylistPlugin.cxx')
-rw-r--r-- | src/playlist/plugins/M3uPlaylistPlugin.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/playlist/plugins/M3uPlaylistPlugin.cxx b/src/playlist/plugins/M3uPlaylistPlugin.cxx index f892f2010..c7f3b5085 100644 --- a/src/playlist/plugins/M3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx @@ -45,14 +45,13 @@ m3u_open_stream(InputStream &is) DetachedSong * M3uPlaylist::NextSong() { - std::string line; const char *line_s; do { - if (!tis.ReadLine(line)) + line_s = tis.ReadLine(); + if (line_s == nullptr) return nullptr; - line_s = line.c_str(); line_s = strchug_fast(line_s); } while (line_s[0] == '#' || *line_s == 0); |