oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/StringUtil: add FindStringSuffix()

Browse Source
This commit is contained in:
Max Kellermann
2015-03-02 22:26:46 +01:00
parent c19292c036
commit 820debf45a
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/PlaylistFile.cxx
View File

@@ -173,12 +173,9 @@ LoadPlaylistFileInfo(PlaylistInfo &info,
return false;
const auto *const name_fs_str = name_fs.c_str();
const size_t name_length = name_fs.length();
if (name_length < ARRAY_SIZE(PLAYLIST_FILE_SUFFIX))
return false;
if (!StringEndsWith(name_fs_str, PLAYLIST_FILE_SUFFIX))
const auto *const name_fs_end =
FindStringSuffix(name_fs_str, PLAYLIST_FILE_SUFFIX);
if (name_fs_end == nullptr)
return false;
FileInfo fi;
@@ -186,8 +183,7 @@ LoadPlaylistFileInfo(PlaylistInfo &info,
!fi.IsRegular())
return false;
PathTraitsFS::string name(name_fs_str,
name_length + 1 - ARRAY_SIZE(PLAYLIST_FILE_SUFFIX));
PathTraitsFS::string name(name_fs_str, name_fs_end);
std::string name_utf8 = PathToUTF8(name.c_str());
if (name_utf8.empty())
return false;