diff options
author | 2016-07-31 23:52:57 -0400 | |
---|---|---|
committer | 2016-07-31 23:52:57 -0400 | |
commit | 59ca4d1763ab890144465cb9822d1530a1e5ec6f (patch) | |
tree | 8354f829f91af50f1deeed65b403baa5b6a16c68 /src/lib/util/corefile.cpp | |
parent | a4f24a24d3ed131d75b407a96a44b7d7c5d68b65 (diff) | |
parent | e2682ec4daae69e3519452446c6e16a6e0999ca6 (diff) |
1. Merge branch 'master' into diimage_filetype_as_stdstring
2. Introduced is_filetype(), instead of normalizing filetype() to lower case
Diffstat (limited to 'src/lib/util/corefile.cpp')
-rw-r--r-- | src/lib/util/corefile.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp index 22b67046150..ff8f3137cc0 100644 --- a/src/lib/util/corefile.cpp +++ b/src/lib/util/corefile.cpp @@ -1294,14 +1294,12 @@ std::string core_filename_extract_base(const std::string &name, bool strip_exten // core_filename_extract_extension // ------------------------------------------------- -std::string core_filename_extract_extension(const std::string &filename, bool strip_period, bool normalize_to_lowercase) +std::string core_filename_extract_extension(const std::string &filename, bool strip_period) { auto loc = filename.find_last_of('.'); std::string result = loc != std::string::npos ? filename.substr(loc + (strip_period ? 1 : 0)) : ""; - if (normalize_to_lowercase) - std::transform(result.begin(), result.end(), result.begin(), ::tolower); return result; } |